mcp-scraper 0.33.4 → 0.33.6

package/dist/bin/api-server.cjs

@@ -3718,7 +3718,7 @@ async function migrate() {
     `);
     applied = { rows: [] };
   }
-  if (applied.rows.length > 0) return;
+  if (applied.rows.length > 0 && await hasCurrentCoreSchema(db)) return;
   if (await hasCurrentCoreSchema(db)) {
     await db.execute({
       sql: "INSERT OR IGNORE INTO schema_migrations (version) VALUES (?)",
@@ -3907,9 +3907,14 @@ async function migrate() {
       source       TEXT NOT NULL,
       stripe_pi    TEXT,
       granted_at   TEXT NOT NULL DEFAULT (datetime('now')),
-      expires_at   TEXT NOT NULL
+      expires_at   TEXT NOT NULL,
+      never_expires INTEGER NOT NULL DEFAULT 0
     )
   `);
+  try {
+    await db.execute(`ALTER TABLE credit_lots ADD COLUMN never_expires INTEGER NOT NULL DEFAULT 0`);
+  } catch {
+  }
   await db.execute(`CREATE INDEX IF NOT EXISTS credit_lots_user_active ON credit_lots(user_id, expires_at, remaining_mc)`);
   await db.execute(`
     CREATE TABLE IF NOT EXISTS free_credit_refreshes (
@@ -5240,7 +5245,7 @@ async function ensureMigrated(userId) {
 async function drainLots(userId, mc) {
   const db = getDb();
   const lots = await db.execute({
-    sql: `SELECT id, remaining_mc FROM credit_lots WHERE user_id = ? AND remaining_mc > 0 AND expires_at > datetime('now') ORDER BY expires_at ASC, granted_at ASC, id ASC`,
+    sql: `SELECT id, remaining_mc FROM credit_lots WHERE user_id = ? AND remaining_mc > 0 AND (never_expires = 1 OR expires_at > datetime('now')) ORDER BY never_expires ASC, expires_at ASC, granted_at ASC, id ASC`,
     args: [userId]
   });
   let need = mc;
@@ -5256,7 +5261,7 @@ async function drainLots(userId, mc) {
 async function expireOldLots() {
   const db = getDb();
   const lots = await db.execute({
-    sql: `SELECT id, user_id, remaining_mc FROM credit_lots WHERE remaining_mc > 0 AND expires_at <= datetime('now') LIMIT 500`
+    sql: `SELECT id, user_id, remaining_mc FROM credit_lots WHERE remaining_mc > 0 AND never_expires = 0 AND expires_at <= datetime('now') LIMIT 500`
   });
   if (lots.rows.length === 0) return { expired_lots: 0, expired_mc: 0 };
   let totalMc = 0;
@@ -5297,9 +5302,15 @@ async function migrateExistingBalancesToLots() {
   }
   return { migrated, total_mc: totalMc };
 }
-async function creditMc(userId, mc, operation, description, stripePaymentIntent) {
+async function creditMc(userId, mc, operation, description, stripePaymentIntent, options) {
   const db = getDb();
   await ensureMigrated(userId);
+  let neverExpires = options?.neverExpires;
+  if (neverExpires === void 0 && mc > 0) {
+    const tier = await db.execute({ sql: "SELECT subscription_tier FROM users WHERE id = ? LIMIT 1", args: [userId] });
+    neverExpires = String(tier.rows[0]?.subscription_tier ?? "").startsWith("sonic");
+  }
+  const expiry = neverExpires ? "9999-12-31 23:59:59" : null;
   if (stripePaymentIntent) {
     const ledgerInsert = await db.execute({
       sql: "INSERT OR IGNORE INTO ledger (user_id, amount_mc, operation, description, stripe_pi) VALUES (?, ?, ?, ?, ?)",
@@ -5311,7 +5322,7 @@ async function creditMc(userId, mc, operation, description, stripePaymentIntent)
     }
     const stmts2 = [];
     if (mc > 0) {
-      stmts2.push({ sql: `INSERT INTO credit_lots (user_id, amount_mc, remaining_mc, source, stripe_pi, expires_at) VALUES (?, ?, ?, ?, ?, datetime('now', ?))`, args: [userId, mc, mc, operation, stripePaymentIntent, CREDIT_LOT_TTL] });
+      stmts2.push({ sql: `INSERT INTO credit_lots (user_id, amount_mc, remaining_mc, source, stripe_pi, expires_at, never_expires) VALUES (?, ?, ?, ?, ?, COALESCE(?, datetime('now', ?)), ?)`, args: [userId, mc, mc, operation, stripePaymentIntent, expiry, CREDIT_LOT_TTL, neverExpires ? 1 : 0] });
     }
     stmts2.push({ sql: "UPDATE users SET balance_mc = balance_mc + ? WHERE id = ?", args: [mc, userId] });
     await db.batch(stmts2, "write");
@@ -5320,7 +5331,7 @@ async function creditMc(userId, mc, operation, description, stripePaymentIntent)
   }
   const stmts = [];
   if (mc > 0) {
-    stmts.push({ sql: `INSERT INTO credit_lots (user_id, amount_mc, remaining_mc, source, stripe_pi, expires_at) VALUES (?, ?, ?, ?, ?, datetime('now', ?))`, args: [userId, mc, mc, operation, null, CREDIT_LOT_TTL] });
+    stmts.push({ sql: `INSERT INTO credit_lots (user_id, amount_mc, remaining_mc, source, stripe_pi, expires_at, never_expires) VALUES (?, ?, ?, ?, ?, COALESCE(?, datetime('now', ?)), ?)`, args: [userId, mc, mc, operation, null, expiry, CREDIT_LOT_TTL, neverExpires ? 1 : 0] });
   }
   stmts.push({ sql: "UPDATE users SET balance_mc = balance_mc + ? WHERE id = ?", args: [mc, userId] });
   stmts.push({ sql: "INSERT INTO ledger (user_id, amount_mc, operation, description, stripe_pi) VALUES (?, ?, ?, ?, ?)", args: [userId, mc, operation, description ?? null, null] });
@@ -5390,11 +5401,11 @@ async function debitMcIdempotent(userId, mc, operation, description, idempotency
                 SELECT id,
                        remaining_mc,
                        COALESCE(SUM(remaining_mc) OVER (
-                         ORDER BY expires_at ASC, granted_at ASC, id ASC
+                         ORDER BY never_expires ASC, expires_at ASC, granted_at ASC, id ASC
                          ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING
                        ), 0) AS prior_mc
                 FROM credit_lots
-                WHERE user_id = ? AND remaining_mc > 0 AND expires_at > datetime('now')
+                WHERE user_id = ? AND remaining_mc > 0 AND (never_expires = 1 OR expires_at > datetime('now'))
               ), allocation AS (
                 SELECT id, MIN(remaining_mc, MAX(0, ? - prior_mc)) AS take_mc
                 FROM ordered
@@ -5550,14 +5561,16 @@ async function settleDebitMcIdempotent(userId, debitIdempotencyKey, finalAmountM
       },
       {
         sql: `INSERT INTO credit_lots
-                (user_id, amount_mc, remaining_mc, source, expires_at)
+                (user_id, amount_mc, remaining_mc, source, expires_at, never_expires)
               SELECT e.user_id,
                      d.amount_mc - e.amount_mc,
                      d.amount_mc - e.amount_mc,
                      ?,
-                     datetime('now', ?)
+                     CASE WHEN u.subscription_tier LIKE 'sonic%' THEN '9999-12-31 23:59:59' ELSE datetime('now', ?) END,
+                     CASE WHEN u.subscription_tier LIKE 'sonic%' THEN 1 ELSE 0 END
               FROM billing_events e
               JOIN billing_debits d ON d.idempotency_key = ?
+              JOIN users u ON u.id = e.user_id
               WHERE e.idempotency_key = ?
                 AND e.status = 'applying'
                 AND d.amount_mc > e.amount_mc`,
@@ -5623,7 +5636,7 @@ async function reconcileBalanceMc(userId, knownBalanceMc) {
   const res = await db.execute({
     sql: `SELECT
       COUNT(*) AS lot_count,
-      COALESCE(SUM(CASE WHEN remaining_mc > 0 AND expires_at > datetime('now') THEN remaining_mc ELSE 0 END), 0) AS balance_mc
+      COALESCE(SUM(CASE WHEN remaining_mc > 0 AND (never_expires = 1 OR expires_at > datetime('now')) THEN remaining_mc ELSE 0 END), 0) AS balance_mc
       FROM credit_lots WHERE user_id = ?`,
     args: [userId]
   });
@@ -5631,7 +5644,7 @@ async function reconcileBalanceMc(userId, knownBalanceMc) {
   if (Number(res.rows[0]?.lot_count ?? 0) === 0) {
     await ensureMigrated(Number(userId));
     const migrated = await db.execute({
-      sql: `SELECT COALESCE(SUM(remaining_mc), 0) AS balance_mc FROM credit_lots WHERE user_id = ? AND remaining_mc > 0 AND expires_at > datetime('now')`,
+      sql: `SELECT COALESCE(SUM(remaining_mc), 0) AS balance_mc FROM credit_lots WHERE user_id = ? AND remaining_mc > 0 AND (never_expires = 1 OR expires_at > datetime('now'))`,
       args: [userId]
     });
     balanceMc = Number(migrated.rows[0]?.balance_mc ?? 0);
@@ -5655,7 +5668,7 @@ var init_db = __esm({
     DB_TOKEN = process.env.TURSO_AUTH_TOKEN;
     _db = null;
     _rateLimitSchemaReady = false;
-    CORE_SCHEMA_VERSION = "2026-07-14.1";
+    CORE_SCHEMA_VERSION = "2026-07-22.1";
     CORE_SCHEMA_TABLES = [
       "billing_authorizations",
       "billing_debits",
@@ -5722,6 +5735,7 @@ var init_db = __esm({
       "workflow_webhook_deliveries_run"
     ];
     CORE_SCHEMA_COLUMNS = {
+      credit_lots: ["never_expires"],
       harvest_attempts: ["debug_json"],
       oauth_tokens: ["replaced_by", "rotated_at"],
       users: [
@@ -8984,7 +8998,7 @@ function insufficientBalanceResponse(balanceMc, requiredMc) {
     topup_url: topupUrl
   };
 }
-var MC_COSTS, MC_PER_BROWSER_MS, BROWSER_OPEN_MIN_BALANCE_MC, MC_PER_CREDIT, BILLING_MC_PER_USD_NUMERATOR, BILLING_MC_PER_USD_DENOMINATOR, BILLING_BASIS_POINTS, USD_NANOS, SCHEDULED_RUN_BASE_CREDITS, SCHEDULED_RUN_BASE_MC, SCHEDULED_AGENT_LLM_MARKUP_BPS, SCHEDULED_AGENT_LLM_MARKUP, SCHEDULED_RUN_DEFAULT_MAX_CREDITS, CONNECTED_USAGE_RATE_POLICY_VERSION, CONNECTED_ACTIVE_CONNECTION_MONTHLY_USD, CONNECTED_FUNCTION_RUN_CREDITS, CONNECTED_PROXY_REQUEST_CREDITS, CONNECTED_COMPUTE_CREDITS_PER_SECOND, CONNECTED_FUNCTION_RUN_MC, CONNECTED_PROXY_REQUEST_MC, CONNECTED_COMPUTE_MC_PER_SECOND, CONNECTED_USAGE_RATE_POLICY, SCHEDULED_ACTIONS_RATE_POLICY, CREDIT_COST_CATALOG, CONCURRENCY_PRICE_ID, SUBSCRIPTION_TIERS, SUBSCRIPTION_TIER_BY_KEY, CONCURRENCY_SLOT_PRICE_USD, CONCURRENCY_SLOT_PRICE_CURRENCY, CONCURRENCY_SLOT_PRICE_INTERVAL, CONCURRENCY_SLOT_PRICE_LABEL, CONCURRENCY_SLOT_TERMINAL_COMMAND, MEMORY_FREE_QUOTA_BYTES, MEMORY_PLANS, MEMORY_PLAN_QUOTA, MEMORY_MARGIN_MULTIPLE, MEMORY_PRO_COST_BUDGET_USD, LedgerOperation, MEMORY_AI_MARGIN_MULTIPLE, SITE_AUDIT_LLM_MARGIN_MULTIPLE, VIDEO_ANALYSIS_LLM_MARGIN_MULTIPLE, MEDIA_TRANSCRIBE_MARGIN_MULTIPLE, MEDIA_TRANSCRIBE_HOLD_MC, MC_PER_USD;
+var MC_COSTS, MC_PER_BROWSER_MS, BROWSER_OPEN_MIN_BALANCE_MC, MC_PER_CREDIT, BILLING_MC_PER_USD_NUMERATOR, BILLING_MC_PER_USD_DENOMINATOR, BILLING_BASIS_POINTS, USD_NANOS, SCHEDULED_RUN_BASE_CREDITS, SCHEDULED_RUN_BASE_MC, SCHEDULED_AGENT_LLM_MARKUP_BPS, SCHEDULED_AGENT_LLM_MARKUP, SCHEDULED_RUN_DEFAULT_MAX_CREDITS, CONNECTED_USAGE_RATE_POLICY_VERSION, CONNECTED_ACTIVE_CONNECTION_MONTHLY_CREDITS, CONNECTED_ACTIVE_CONNECTION_MONTHLY_MC, CONNECTED_FUNCTION_RUN_CREDITS, CONNECTED_PROXY_REQUEST_CREDITS, CONNECTED_COMPUTE_CREDITS_PER_SECOND, CONNECTED_FUNCTION_RUN_MC, CONNECTED_PROXY_REQUEST_MC, CONNECTED_COMPUTE_MC_PER_SECOND, CONNECTED_USAGE_RATE_POLICY, SCHEDULED_ACTIONS_RATE_POLICY, CREDIT_COST_CATALOG, CONCURRENCY_PRICE_ID, SUBSCRIPTION_TIERS, SUBSCRIPTION_TIER_BY_KEY, CONCURRENCY_SLOT_PRICE_USD, CONCURRENCY_SLOT_PRICE_CURRENCY, CONCURRENCY_SLOT_PRICE_INTERVAL, CONCURRENCY_SLOT_PRICE_LABEL, CONCURRENCY_SLOT_TERMINAL_COMMAND, MEMORY_FREE_QUOTA_BYTES, MEMORY_PLANS, MEMORY_PLAN_QUOTA, MEMORY_MARGIN_MULTIPLE, MEMORY_PRO_COST_BUDGET_USD, LedgerOperation, MEMORY_AI_MARGIN_MULTIPLE, SITE_AUDIT_LLM_MARGIN_MULTIPLE, VIDEO_ANALYSIS_LLM_MARGIN_MULTIPLE, MEDIA_TRANSCRIBE_MARGIN_MULTIPLE, MEDIA_TRANSCRIBE_HOLD_MC, MC_PER_USD;
 var init_rates = __esm({
   "src/api/rates.ts"() {
     "use strict";
@@ -9032,8 +9046,9 @@ var init_rates = __esm({
     SCHEDULED_AGENT_LLM_MARKUP_BPS = 15e3;
     SCHEDULED_AGENT_LLM_MARKUP = SCHEDULED_AGENT_LLM_MARKUP_BPS / BILLING_BASIS_POINTS;
     SCHEDULED_RUN_DEFAULT_MAX_CREDITS = 5e3;
-    CONNECTED_USAGE_RATE_POLICY_VERSION = "2026-07-15.connected-usage-v1";
-    CONNECTED_ACTIVE_CONNECTION_MONTHLY_USD = 3;
+    CONNECTED_USAGE_RATE_POLICY_VERSION = "2026-07-23.connected-usage-v2";
+    CONNECTED_ACTIVE_CONNECTION_MONTHLY_CREDITS = 15e3;
+    CONNECTED_ACTIVE_CONNECTION_MONTHLY_MC = CONNECTED_ACTIVE_CONNECTION_MONTHLY_CREDITS * MC_PER_CREDIT;
     CONNECTED_FUNCTION_RUN_CREDITS = 2;
     CONNECTED_PROXY_REQUEST_CREDITS = 2;
     CONNECTED_COMPUTE_CREDITS_PER_SECOND = 5;
@@ -9041,18 +9056,17 @@ var init_rates = __esm({
     CONNECTED_PROXY_REQUEST_MC = CONNECTED_PROXY_REQUEST_CREDITS * MC_PER_CREDIT;
     CONNECTED_COMPUTE_MC_PER_SECOND = CONNECTED_COMPUTE_CREDITS_PER_SECOND * MC_PER_CREDIT;
     CONNECTED_USAGE_RATE_POLICY = {
-      schemaVersion: 1,
+      schemaVersion: 2,
       ratePolicyVersion: CONNECTED_USAGE_RATE_POLICY_VERSION,
-      effectiveAt: "2026-07-15T00:00:00.000Z",
+      effectiveAt: "2026-07-23T00:00:00.000Z",
       provider: "nango",
       entitlement: "paid_plan_add_on",
       connection: {
-        billingMode: "flat_recurring_usd",
-        amountUsd: CONNECTED_ACTIVE_CONNECTION_MONTHLY_USD,
-        currency: "usd",
+        billingMode: "flat_recurring_credits",
+        amountCredits: CONNECTED_ACTIVE_CONNECTION_MONTHLY_CREDITS,
         interval: "month",
         unit: "active_connection",
-        proration: "subscription_period"
+        proration: "none"
       },
       usage: {
         billingMode: "credits",
@@ -9321,7 +9335,9 @@ var init_rates = __esm({
     SUBSCRIPTION_TIERS = {
       "price_1TmiHRS8aAcsk3TGwmSNfNIa": { tier: "starter", label: "Starter", price_id: "price_1TmiHRS8aAcsk3TGwmSNfNIa", monthly_usd: 12, credits_mc: 8e6, concurrency: 3, intro_coupon: "mcp-starter-1dollar-intro-12" },
       "price_1TrgihS8aAcsk3TG5cglrq4D": { tier: "growth", label: "Growth", price_id: "price_1TrgihS8aAcsk3TG5cglrq4D", monthly_usd: 40, credits_mc: 26666700, concurrency: 10, intro_coupon: null },
-      "price_1TrgihS8aAcsk3TG4HnG4gbY": { tier: "scale", label: "Scale", price_id: "price_1TrgihS8aAcsk3TG4HnG4gbY", monthly_usd: 100, credits_mc: 8e7, concurrency: 20, intro_coupon: null }
+      "price_1TrgihS8aAcsk3TG4HnG4gbY": { tier: "scale", label: "Scale", price_id: "price_1TrgihS8aAcsk3TG4HnG4gbY", monthly_usd: 100, credits_mc: 8e7, concurrency: 20, intro_coupon: null },
+      "price_1TwAl2S8aAcsk3TGC8xvpM3S": { tier: "sonic", label: "Sonic Annual", price_id: "price_1TwAl2S8aAcsk3TGC8xvpM3S", monthly_usd: 25, credits_mc: 25e7, concurrency: 3, intro_coupon: null, billing_interval: "year", credits_never_expire: true, private_offer: true },
+      "price_1TwAl3S8aAcsk3TGnORwFd87": { tier: "sonic-memory", label: "Sonic Annual + Memory Pro", price_id: "price_1TwAl3S8aAcsk3TGnORwFd87", monthly_usd: 34.5, credits_mc: 25e7, concurrency: 3, intro_coupon: null, billing_interval: "year", credits_never_expire: true, includes_memory: true, private_offer: true }
     };
     SUBSCRIPTION_TIER_BY_KEY = Object.fromEntries(
       Object.values(SUBSCRIPTION_TIERS).map((t) => [t.tier, t])
@@ -9405,7 +9421,8 @@ var init_rates = __esm({
       DIFF_PAGE_REFUND: "diff_page_refund",
       SITE_AUDIT_LLM: "site_audit_llm",
       SCHEDULED_RUN: "scheduled_run",
-      CONNECTED_USAGE: "connected_usage"
+      CONNECTED_USAGE: "connected_usage",
+      CONNECTED_ACCOUNT_FEE: "connected_account_fee"
     };
     MEMORY_AI_MARGIN_MULTIPLE = 3;
     SITE_AUDIT_LLM_MARGIN_MULTIPLE = 1.5;
@@ -19249,12 +19266,117 @@ var init_video_routes = __esm({
   }
 });
 
-// src/extractor/MapsSearchExtractor.ts
-function buildGoogleLocalResultsUrl(input) {
-  const query = [input.query, input.location].filter(Boolean).join(" ");
-  const params = new URLSearchParams({ q: query, udm: "1", gl: input.gl, hl: input.hl, pws: "0" });
-  return `https://www.google.com/search?${params.toString()}`;
+// src/extractor/GoogleBusinessPanel.ts
+function clickNamedBusinessCardInBrowser(businessName) {
+  const normalize4 = (value) => (value ?? "").replace(/\s+/g, " ").trim().toLowerCase();
+  const expected = normalize4(businessName);
+  const headings = Array.from(document.querySelectorAll('div[role="heading"], h3')).filter((heading) => normalize4(heading.textContent) === expected);
+  for (const heading of headings) {
+    if (heading.closest('[role="dialog"], dialog')) continue;
+    const directlyClickable = heading.closest(
+      'button, a, [role="button"], [role="link"], [jsaction]'
+    );
+    if (directlyClickable) {
+      directlyClickable.click();
+      return true;
+    }
+    let target = heading;
+    for (let hop = 0; hop < 8; hop++) {
+      const parent = target.parentElement;
+      if (!parent || parent.querySelectorAll('div[role="heading"], h3').length > 1) break;
+      target = parent;
+    }
+    target.click();
+    return true;
+  }
+  return false;
+}
+function clickBusinessPanelRowInBrowser(input) {
+  const normalize4 = (value) => (value ?? "").replace(/\s+/g, " ").trim();
+  const expectedBusiness = normalize4(input.businessName).toLowerCase();
+  const visible = (element) => element.getAttribute("aria-hidden") !== "true" && (element.offsetParent !== null || element.getClientRects().length > 0);
+  const dialogs = Array.from(document.querySelectorAll('dialog, [role="dialog"]')).filter((dialog) => visible(dialog) && normalize4(dialog.innerText).toLowerCase().includes(expectedBusiness)).reverse();
+  for (const dialog of dialogs) {
+    const row = Array.from(
+      dialog.querySelectorAll('button, a, [role="button"]')
+    ).find((element) => visible(element) && normalize4(element.innerText).startsWith(input.prefix));
+    if (row) {
+      row.click();
+      return true;
+    }
+  }
+  return false;
+}
+function extractOpenBusinessPanelDialogItemsInBrowser(expectedHeading) {
+  const normalize4 = (value) => (value ?? "").trim();
+  const dialogs = Array.from(document.querySelectorAll('dialog, [role="dialog"]')).filter((dialog) => dialog.getAttribute("aria-hidden") !== "true").reverse();
+  const matchingDialog = dialogs.find((dialog) => {
+    const heading2 = dialog.querySelector('h1, h2, [role="heading"]');
+    return normalize4(heading2?.innerText || heading2?.textContent).startsWith(expectedHeading);
+  });
+  if (!matchingDialog) return [];
+  const heading = matchingDialog.querySelector('h1, h2, [role="heading"]');
+  const headingLines = new Set(
+    normalize4(heading?.innerText || heading?.textContent).split("\n").map((value) => value.trim()).filter(Boolean)
+  );
+  const seen = /* @__PURE__ */ new Set();
+  const items = [];
+  matchingDialog.querySelectorAll("*").forEach((element) => {
+    if (heading?.contains(element)) return;
+    if (element.children.length > 0) return;
+    const value = normalize4(element.innerText || element.textContent);
+    if (!value || headingLines.has(value) || seen.has(value)) return;
+    if (/^(back|close|done|thanks)$/i.test(value)) return;
+    if (/^serves\s.*following/i.test(value)) return;
+    seen.add(value);
+    items.push(value);
+  });
+  return items;
+}
+function closeOpenBusinessPanelDialogInBrowser(expectedHeading) {
+  const dialogs = Array.from(document.querySelectorAll('dialog, [role="dialog"]')).filter((dialog) => dialog.getAttribute("aria-hidden") !== "true").reverse();
+  const matchingDialog = dialogs.find((dialog) => {
+    const heading = dialog.querySelector('h1, h2, [role="heading"]');
+    return (heading?.innerText || heading?.textContent || "").trim().startsWith(expectedHeading);
+  });
+  const close = matchingDialog?.querySelector(
+    '[aria-label*="Close" i], button[aria-label*="close" i]'
+  );
+  close?.click();
+  return Boolean(close);
+}
+async function clickPanelRowWithRetry(page, businessName, prefix) {
+  const input = { businessName, prefix };
+  if (await page.evaluate(clickBusinessPanelRowInBrowser, input)) return true;
+  await page.waitForTimeout(1500);
+  return page.evaluate(clickBusinessPanelRowInBrowser, input);
+}
+async function extractExpandedList(page, businessName, rowPrefix, dialogHeading) {
+  if (!await clickPanelRowWithRetry(page, businessName, rowPrefix)) return [];
+  await page.waitForTimeout(500);
+  const items = await page.evaluate(
+    extractOpenBusinessPanelDialogItemsInBrowser,
+    dialogHeading
+  );
+  await page.evaluate(closeOpenBusinessPanelDialogInBrowser, dialogHeading);
+  await page.waitForTimeout(250);
+  return items;
+}
+async function extractExpandedGoogleBusinessPanelServices(page, businessName) {
+  const services = await extractExpandedList(page, businessName, "Services:", "Services");
+  const areasServed = await extractExpandedList(page, businessName, "Serves ", "Areas Served");
+  return { services, areasServed };
+}
+function completeCollapsedPanelValues(values) {
+  return values.filter((value) => !/(?:\.{3}|…)\s*$/.test(value.trim()));
 }
+var init_GoogleBusinessPanel = __esm({
+  "src/extractor/GoogleBusinessPanel.ts"() {
+    "use strict";
+  }
+});
+
+// src/extractor/MapsSearchExtractor.ts
 function buildGoogleOrganicSearchUrl(input) {
   const query = [input.query, input.location].filter(Boolean).join(" ");
   const params = new URLSearchParams({ q: query, gl: input.gl, hl: input.hl, pws: "0" });
@@ -19282,6 +19404,7 @@ var init_MapsSearchExtractor = __esm({
     "use strict";
     init_errors();
     init_BrowserDriver();
+    init_GoogleBusinessPanel();
     LOCAL_RESULTS_PAGE_LIMIT = 8;
     LOCAL_RESULTS_WAIT_MS = 1e3;
     MAPS_REDIRECT_BASE = "https://serp-redirector.vercel.app";
@@ -19530,6 +19653,11 @@ var init_MapsSearchExtractor = __esm({
             areasServed
           };
         }, includeServices);
+        if (includeServices) {
+          const expanded = await extractExpandedGoogleBusinessPanelServices(page, card.name);
+          details.services = expanded.services.length > 0 ? expanded.services : completeCollapsedPanelValues(details.services);
+          details.areasServed = expanded.areasServed.length > 0 ? expanded.areasServed : completeCollapsedPanelValues(details.areasServed);
+        }
         await this.closeDialog(page);
         return details;
       }
@@ -19576,12 +19704,15 @@ var init_MapsSearchExtractor = __esm({
 });
 
 // src/extractor/MapsNavigator.ts
-var MapsNavigator;
+var BUSINESS_PANEL_REDIRECT_BASE, MapsNavigator;
 var init_MapsNavigator = __esm({
   "src/extractor/MapsNavigator.ts"() {
     "use strict";
     init_selectors();
+    init_BrowserDriver();
+    init_GoogleBusinessPanel();
     init_MapsSearchExtractor();
+    BUSINESS_PANEL_REDIRECT_BASE = "https://serp-redirector.vercel.app";
     MapsNavigator = class {
       constructor(page) {
         this.page = page;
@@ -19639,26 +19770,67 @@ var init_MapsNavigator = __esm({
         await this.page.waitForSelector('[role="main"] h2', { timeout: 5e3 }).catch(() => {
         });
       }
-      async navigateToSerpBusinessPanel(businessName, location2, gl, hl) {
-        const searchUrl = buildGoogleLocalResultsUrl({ query: businessName, location: location2, gl, hl });
-        await this.page.goto(searchUrl, { waitUntil: "domcontentloaded", timeout: 45e3 }).catch(() => {
+      async navigateToSerpBusinessPanel(businessName, location2, gl, hl, category) {
+        const searchUrl = buildGoogleOrganicSearchUrl({
+          query: category?.trim() || businessName,
+          location: location2,
+          gl,
+          hl
         });
-        await this.page.waitForTimeout(1e3);
-        const clicked = await this.page.evaluate((name) => {
-          const normalized = name.replace(/\s+/g, " ").trim().toLowerCase();
-          const card = Array.from(document.querySelectorAll("button")).find(
-            (button) => button.querySelector("h3")?.textContent?.replace(/\s+/g, " ").trim().toLowerCase() === normalized
-          );
-          if (card) {
-            card.click();
-            return true;
-          }
-          return false;
-        }, businessName);
-        if (!clicked) return false;
-        await this.page.waitForSelector('dialog, [role="dialog"]', { timeout: 5e3 }).catch(() => {
+        const arrivalUrl = serpArrivalUrl(
+          searchUrl,
+          process.env.SERP_REDIRECT_BASE?.trim() || BUSINESS_PANEL_REDIRECT_BASE
+        );
+        await this.page.goto(arrivalUrl, { waitUntil: "domcontentloaded", timeout: 45e3 }).catch(() => {
+        });
+        await this.page.waitForTimeout(2e3);
+        if (await this.isGoogleChallenge()) return false;
+        await this.waitForNamedBusinessCard(businessName, 5e3);
+        if (await this.page.evaluate(clickNamedBusinessCardInBrowser, businessName)) {
+          return this.waitForBusinessDialog(businessName);
+        }
+        const moreBusinesses = this.page.getByRole("link", { name: /more (businesses|places|results)/i }).or(this.page.getByRole("button", { name: /more (businesses|places|results)/i })).first();
+        if (!await moreBusinesses.isVisible({ timeout: 5e3 }).catch(() => false)) return false;
+        await moreBusinesses.click({ timeout: 1e4 }).catch(() => {
         });
-        return this.page.locator('dialog, [role="dialog"]').count().then((count) => count > 0);
+        await this.page.waitForTimeout(3e3);
+        if (await this.isGoogleChallenge()) return false;
+        await this.waitForNamedBusinessCard(businessName, 3e3);
+        if (!await this.page.evaluate(clickNamedBusinessCardInBrowser, businessName)) {
+          const searchBox = this.page.locator('textarea[name="q"]:visible, input[name="q"]:visible').first();
+          if (!await searchBox.isVisible({ timeout: 5e3 }).catch(() => false)) return false;
+          await searchBox.fill(`${businessName} ${location2}`);
+          await searchBox.press("Enter");
+          await this.page.waitForTimeout(3e3);
+          if (await this.isGoogleChallenge()) return false;
+          await this.waitForNamedBusinessCard(businessName, 1e4);
+          if (!await this.page.evaluate(clickNamedBusinessCardInBrowser, businessName)) return false;
+        }
+        return this.waitForBusinessDialog(businessName);
+      }
+      async isGoogleChallenge() {
+        return this.page.evaluate(() => {
+          const text2 = (document.body?.innerText ?? "").slice(0, 2e3);
+          return /unusual traffic|captcha|recaptcha|about this page/i.test(text2) || /\/sorry\//.test(location.href);
+        }).catch(() => true);
+      }
+      async waitForNamedBusinessCard(businessName, timeout) {
+        if (typeof this.page.waitForFunction !== "function") return;
+        await this.page.waitForFunction(
+          (expectedName) => {
+            const normalize4 = (value) => value.replace(/\s+/g, " ").trim().toLowerCase();
+            const expected = normalize4(expectedName);
+            return Array.from(document.querySelectorAll('div[role="heading"], h3')).some((element) => normalize4(element.textContent ?? "") === expected);
+          },
+          businessName,
+          { timeout }
+        ).catch(() => void 0);
+      }
+      async waitForBusinessDialog(businessName) {
+        const dialog = this.page.locator('dialog:visible, [role="dialog"]:visible').filter({ hasText: businessName }).first();
+        await dialog.waitFor({ state: "visible", timeout: 1e4 }).catch(() => {
+        });
+        return dialog.isVisible().catch(() => false);
       }
       buildReviewsUrl(placeUrl) {
         const fid = placeUrl.match(/!1s(0x[0-9a-f]+:0x[0-9a-f]+)/i);
@@ -19705,6 +19877,79 @@ var init_MapsNavigator = __esm({
   }
 });
 
+// src/extractor/GoogleBusinessPanelRotation.ts
+async function extractGoogleBusinessPanelServicesWithRotation(options) {
+  const maxAttempts = Math.max(1, options.maxAttempts ?? 5);
+  for (let attemptIndex = 0; attemptIndex < maxAttempts; attemptIndex += 1) {
+    const driver = new BrowserDriver();
+    const attemptNumber = attemptIndex + 1;
+    const useDefaultProxy = attemptIndex < 2;
+    const useHeadful = attemptIndex === maxAttempts - 1;
+    try {
+      await driver.launch({
+        headless: useHeadful ? false : options.headless,
+        headlessMode: useHeadful ? "headful" : options.headless ? "headless" : "headful",
+        kernelApiKey: options.kernelApiKey,
+        keepDefaultProxy: useDefaultProxy,
+        proxyMode: "none",
+        viewport: { width: 1280, height: 900 },
+        locale: `${options.hl}-${options.gl.toUpperCase()}`
+      });
+      const page = driver.getPage();
+      const opened = await new MapsNavigator(page).navigateToSerpBusinessPanel(
+        options.businessName,
+        options.location,
+        options.gl,
+        options.hl,
+        options.category
+      );
+      if (!opened) {
+        console.warn(JSON.stringify({
+          event: "maps_place_services_panel_not_opened",
+          attempt_number: attemptNumber,
+          max_attempts: maxAttempts,
+          keep_default_proxy: useDefaultProxy,
+          headless_mode: useHeadful ? "headful" : options.headless ? "headless" : "headful",
+          final_url: page.url()
+        }));
+        continue;
+      }
+      const result = await extractExpandedGoogleBusinessPanelServices(
+        page,
+        options.businessName
+      );
+      return {
+        ...result,
+        opened: true,
+        attempts: attemptNumber
+      };
+    } catch (error) {
+      console.warn(JSON.stringify({
+        event: "maps_place_services_attempt_failed",
+        attempt_number: attemptNumber,
+        max_attempts: maxAttempts,
+        message: error instanceof Error ? error.message : String(error)
+      }));
+    } finally {
+      await driver.close().catch(() => void 0);
+    }
+  }
+  return {
+    services: [],
+    areasServed: [],
+    opened: false,
+    attempts: maxAttempts
+  };
+}
+var init_GoogleBusinessPanelRotation = __esm({
+  "src/extractor/GoogleBusinessPanelRotation.ts"() {
+    "use strict";
+    init_BrowserDriver();
+    init_GoogleBusinessPanel();
+    init_MapsNavigator();
+  }
+});
+
 // src/extractor/MapsReviewCollector.ts
 var REVIEW_SCROLL_BUDGET_MS, REVIEW_SCROLL_STEP_MS, MapsReviewCollector;
 var init_MapsReviewCollector = __esm({
@@ -19790,6 +20035,8 @@ var init_MapsExtractor = __esm({
     "use strict";
     init_schemas3();
     init_selectors();
+    init_GoogleBusinessPanel();
+    init_GoogleBusinessPanelRotation();
     init_MapsNavigator();
     init_MapsReviewCollector();
     import_zod23 = require("zod");
@@ -19851,14 +20098,33 @@ var init_MapsExtractor = __esm({
           let servicesStatus = "not_requested";
           if (options.includeServices) {
             try {
-              const opened = await navigator.navigateToSerpBusinessPanel(options.businessName, options.location, options.gl, options.hl);
+              let opened = await navigator.navigateToSerpBusinessPanel(
+                options.businessName,
+                options.location,
+                options.gl,
+                options.hl,
+                overview.category ?? void 0
+              );
               if (opened) {
-                const result = await this.extractServicesAndAreasServed(page);
+                const result = await extractExpandedGoogleBusinessPanelServices(page, options.businessName);
                 services = result.services;
                 areasServed = result.areasServed;
                 servicesStatus = services.length > 0 || areasServed.length > 0 ? "collected" : "none_exist";
               } else {
-                servicesStatus = "unavailable";
+                await this.driver.close().catch(() => void 0);
+                const result = await extractGoogleBusinessPanelServicesWithRotation({
+                  businessName: options.businessName,
+                  location: options.location,
+                  category: overview.category ?? void 0,
+                  gl: options.gl,
+                  hl: options.hl,
+                  headless: options.headless,
+                  kernelApiKey: options.kernelApiKey
+                });
+                opened = result.opened;
+                services = result.services;
+                areasServed = result.areasServed;
+                servicesStatus = opened ? services.length > 0 || areasServed.length > 0 ? "collected" : "none_exist" : "unavailable";
               }
             } catch (err) {
               console.warn("[MapsExtractor] services/areas-served extraction failed:", err instanceof Error ? err.message : String(err));
@@ -20071,18 +20337,6 @@ var init_MapsExtractor = __esm({
         }
         return result.data;
       }
-      async extractServicesAndAreasServed(page) {
-        return page.evaluate(() => {
-          const visible = Array.from(document.querySelectorAll('dialog, [role="dialog"]')).find((dialog) => dialog.offsetParent !== null);
-          if (!visible) return { services: [], areasServed: [] };
-          const values = Array.from(visible.querySelectorAll("button")).map((button) => button.innerText.replace(/\s+/g, " ").trim()).filter(Boolean);
-          const servicesText = values.find((value) => /^services\s*:/i.test(value));
-          const services = servicesText ? [...new Set(servicesText.replace(/^services\s*:\s*/i, "").split(/\s*[,·]\s*/).map((value) => value.trim()).filter(Boolean))] : [];
-          const served = values.find((value) => /^serves\b/i.test(value));
-          const areasServed = served ? [served.replace(/^serves\s*/i, "").trim()].filter(Boolean) : [];
-          return { services, areasServed };
-        });
-      }
     };
   }
 });
@@ -29815,7 +30069,7 @@ var PACKAGE_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    PACKAGE_VERSION = "0.33.4";
+    PACKAGE_VERSION = "0.33.6";
   }
 });
 
@@ -29845,9 +30099,11 @@ seam is noted so you can chain them.
 
 ## Google Maps
 - Find multiple places/competitors/prospects -> **maps_search** (returns \`results[]\` with name,
-  placeUrl, cid).
-- One business deep-dive + reviews -> **maps_place_intel** (takes businessName + location, NOT an id \u2014
-  call it directly with a name from a \`maps_search\` result or from the user).
+  placeUrl, cid; set \`includeServices: true\` to enrich each result where available).
+- One business deep-dive -> **maps_place_intel** (takes businessName + location, NOT an id; returns
+  reviews, full hours, About attributes, entity IDs/CID, and with \`includeServices: true\`, the full
+  configured services and areas-served lists. Call it directly with a name from a \`maps_search\` result
+  or from the user).
 
 ## YouTube
 - Find or list videos -> **youtube_harvest** (returns \`videos[].videoId\`).
@@ -32307,7 +32563,7 @@ function registerPaaExtractorMcpTools(server, executor, options = {}) {
   }, async (input) => formatInstagramMediaDownload(await executor.instagramMediaDownload(input), input));
   server.registerTool("maps_place_intel", {
     title: "Google Maps Business Profile Details",
-    description: "Extract Google Maps business intelligence for one known/named business: rating, reviews, category, address, phone, hours, entity IDs. Not for category searches or multi-business prospect lists \u2014 use maps_search for those. Split business name from location.",
+    description: "Deep-dive one known/named Google Business Profile: rating, reviews, category, address, phone, full hours, About attributes, entity IDs/CID, and \u2014 with includeServices: true \u2014 the full configured services and areas-served lists. Not for category searches or multi-business prospect lists; use maps_search for those. Split business name from location.",
     inputSchema: MapsPlaceIntelInputSchema,
     outputSchema: recordOutputSchema("maps_place_intel", MapsPlaceIntelOutputSchema),
     annotations: liveWebToolAnnotations("Google Maps Business Profile Details")
@@ -40192,12 +40448,12 @@ function connectedAccountBillingView(actualQuantity, state) {
   const quantity = Math.max(0, Math.round(actualQuantity));
   return {
     provider: "nango",
-    billingMode: "flat_recurring_usd_plus_credits",
+    billingMode: "flat_recurring_credits",
     priceId: connectedAccountPriceId(),
-    unitAmountUsd: CONNECTED_ACTIVE_CONNECTION_MONTHLY_USD,
+    unitAmountCredits: CONNECTED_ACTIVE_CONNECTION_MONTHLY_CREDITS,
     interval: "month",
     quantity,
-    projectedMonthlyUsd: quantity * CONNECTED_ACTIVE_CONNECTION_MONTHLY_USD,
+    projectedMonthlyCredits: quantity * CONNECTED_ACTIVE_CONNECTION_MONTHLY_CREDITS,
     status: state?.status ?? "pending",
     lastErrorCode: state?.last_error_code ?? null,
     syncedAt: state?.synced_at ?? null,
@@ -40207,29 +40463,23 @@ function connectedAccountBillingView(actualQuantity, state) {
 function findBasePlanItem(subscription) {
   return subscription.items.data.find((item) => !!item.price?.id && item.price.id in SUBSCRIPTION_TIERS);
 }
-function findConnectedAccountItem(subscription, priceId = connectedAccountPriceId()) {
-  return priceId ? subscription.items.data.find((item) => item.price?.id === priceId) : void 0;
-}
-function liveSubscription(subscription) {
-  return subscription.status === "active" || subscription.status === "trialing";
-}
-function safeStripeErrorCode(error) {
+function safeErrorCode(error) {
   if (error instanceof ConnectedAccountBillingError) return error.code;
   return "stripe_connection_billing_failed";
 }
-async function persistFailure(user, actualQuantity, error, subscriptionItemId = null) {
+async function persistFailure(user, quantityToPersist, error) {
   await setConnectedAccountBillingState({
     userId: user.id,
     stripeSubscriptionId: user.subscription_id,
-    stripeSubscriptionItemId: subscriptionItemId,
+    stripeSubscriptionItemId: null,
     priceId: connectedAccountPriceId(),
-    quantity: actualQuantity,
+    quantity: quantityToPersist,
     status: error instanceof ConnectedAccountBillingError && error.code !== "stripe_connection_billing_failed" ? "blocked" : "error",
-    lastErrorCode: safeStripeErrorCode(error),
+    lastErrorCode: safeErrorCode(error),
     synced: false
   });
 }
-async function reconcileConnectedAccountBilling(user, actualQuantity, stripeClient) {
+async function reconcileConnectedAccountBilling(user, actualQuantity) {
   if (!Number.isSafeInteger(actualQuantity) || actualQuantity < 0) {
     throw new Error("actualQuantity must be a non-negative safe integer");
   }
@@ -40243,7 +40493,7 @@ async function reconcileConnectedAccountBilling(user, actualQuantity, stripeClie
     await persistFailure(user, actualQuantity, error);
     throw error;
   }
-  if (!user.subscription_id) {
+  if (!user.subscription_id || !(user.subscription_tier ?? "") || !Object.values(SUBSCRIPTION_TIERS).some((t) => t.tier === user.subscription_tier)) {
     if (actualQuantity === 0) {
       const state = await setConnectedAccountBillingState({
         userId: user.id,
@@ -40265,48 +40515,38 @@ async function reconcileConnectedAccountBilling(user, actualQuantity, stripeClie
     await persistFailure(user, actualQuantity, error);
     throw error;
   }
-  const client2 = stripeClient ?? (() => {
-    const secret2 = process.env.STRIPE_SECRET_KEY?.trim();
-    if (!secret2) {
-      throw new ConnectedAccountBillingError(
-        "Stripe is not configured.",
-        "connected_account_price_not_configured",
-        503
-      );
-    }
-    return new import_stripe.default(secret2, { apiVersion: STRIPE_API_VERSION });
-  })();
-  let currentItem;
+  const existingState = await getConnectedAccountBillingState(user.id);
+  const currentQuantity = Math.max(0, existingState?.quantity ?? 0);
   try {
-    const subscription = await client2.subscriptions.retrieve(user.subscription_id);
-    currentItem = findConnectedAccountItem(subscription, priceId);
-    if (!liveSubscription(subscription)) {
-      throw new ConnectedAccountBillingError(
-        "The plan subscription is not active.",
-        "subscription_not_active",
-        402
-      );
-    }
-    if (!findBasePlanItem(subscription)) {
-      throw new ConnectedAccountBillingError(
-        "The base plan item could not be found on this subscription.",
-        "subscription_plan_item_missing",
-        409
+    if (actualQuantity > currentQuantity) {
+      const newConnections = actualQuantity - currentQuantity;
+      const feeMc = newConnections * CONNECTED_ACTIVE_CONNECTION_MONTHLY_MC;
+      const debit = await debitMc(
+        user.id,
+        feeMc,
+        LedgerOperation.CONNECTED_ACCOUNT_FEE,
+        `${newConnections} connected account${newConnections === 1 ? "" : "s"} at ${CONNECTED_ACTIVE_CONNECTION_MONTHLY_CREDITS} credits/month`
       );
-    }
-    const currentQuantity = Math.max(0, currentItem?.quantity ?? 0);
-    let resultingItem = currentItem;
-    if (actualQuantity !== currentQuantity) {
-      const updated = await client2.subscriptions.update(subscription.id, {
-        items: actualQuantity === 0 ? currentItem ? [{ id: currentItem.id, deleted: true }] : [] : currentItem ? [{ id: currentItem.id, quantity: actualQuantity }] : [{ price: priceId, quantity: actualQuantity }],
-        proration_behavior: "create_prorations"
-      });
-      resultingItem = findConnectedAccountItem(updated, priceId);
+      if (!debit.ok) {
+        const requiredMc = feeMc;
+        const error = new ConnectedAccountBillingError(
+          `Insufficient credits to connect. Balance: ${mcToCredits(debit.balance_mc)} credits. Connecting requires ${mcToCredits(requiredMc)} credits (${mcToCredits(requiredMc - debit.balance_mc)} short). Upgrade your plan or wait for your credits to refresh.`,
+          "insufficient_credits",
+          402,
+          {
+            balanceCredits: mcToCredits(debit.balance_mc),
+            requiredCredits: mcToCredits(requiredMc),
+            shortByCredits: mcToCredits(Math.max(0, requiredMc - debit.balance_mc))
+          }
+        );
+        await persistFailure(user, currentQuantity, error);
+        throw error;
+      }
     }
     const state = await setConnectedAccountBillingState({
       userId: user.id,
-      stripeSubscriptionId: subscription.id,
-      stripeSubscriptionItemId: resultingItem?.id ?? null,
+      stripeSubscriptionId: user.subscription_id,
+      stripeSubscriptionItemId: null,
       priceId,
       quantity: actualQuantity,
       status: "synced",
@@ -40315,10 +40555,10 @@ async function reconcileConnectedAccountBilling(user, actualQuantity, stripeClie
     });
     return connectedAccountBillingView(actualQuantity, state);
   } catch (error) {
-    await persistFailure(user, actualQuantity, error, currentItem?.id ?? null);
     if (error instanceof ConnectedAccountBillingError) throw error;
+    await persistFailure(user, currentQuantity, error);
     throw new ConnectedAccountBillingError(
-      "Unable to update connected-account billing in Stripe.",
+      "Unable to update connected-account billing.",
       "stripe_connection_billing_failed",
       503
     );
@@ -40327,24 +40567,24 @@ async function reconcileConnectedAccountBilling(user, actualQuantity, stripeClie
 async function currentConnectedAccountBillingView(userId, actualQuantity) {
   return connectedAccountBillingView(actualQuantity, await getConnectedAccountBillingState(userId));
 }
-var import_stripe, DEFAULT_CONNECTED_ACCOUNT_PRICE_ID, STRIPE_API_VERSION, ConnectedAccountBillingError;
+var DEFAULT_CONNECTED_ACCOUNT_PRICE_ID, ConnectedAccountBillingError;
 var init_connected_account_billing = __esm({
   "src/api/connected-account-billing.ts"() {
     "use strict";
-    import_stripe = __toESM(require("stripe"), 1);
     init_db();
     init_rates();
     DEFAULT_CONNECTED_ACCOUNT_PRICE_ID = "price_1TtYPAS8aAcsk3TGHOgrDZiQ";
-    STRIPE_API_VERSION = "2026-02-25.clover";
     ConnectedAccountBillingError = class extends Error {
-      constructor(message, code, status = 409) {
+      constructor(message, code, status = 409, details) {
         super(message);
         this.code = code;
         this.status = status;
+        this.details = details;
         this.name = "ConnectedAccountBillingError";
       }
       code;
       status;
+      details;
     };
   }
 });
@@ -40362,17 +40602,17 @@ async function resolveUser2(customerId, emailFallback) {
   if (user) await setStripeCustomerId(user.id, customerId);
   return user;
 }
-var import_stripe2, import_hono19, stripe, stripeApp;
+var import_stripe, import_hono19, stripe, stripeApp;
 var init_stripe_routes = __esm({
   "src/api/stripe-routes.ts"() {
     "use strict";
-    import_stripe2 = __toESM(require("stripe"), 1);
+    import_stripe = __toESM(require("stripe"), 1);
     import_hono19 = require("hono");
     init_db();
     init_rates();
     init_memory();
     init_connected_account_billing();
-    stripe = new import_stripe2.default(process.env.STRIPE_SECRET_KEY, { apiVersion: "2026-02-25.clover" });
+    stripe = new import_stripe.default(process.env.STRIPE_SECRET_KEY, { apiVersion: "2026-02-25.clover" });
     stripeApp = new import_hono19.Hono();
     stripeApp.post("/webhooks", async (c) => {
       const sig = c.req.header("stripe-signature");
@@ -40401,17 +40641,41 @@ var init_stripe_routes = __esm({
           if (tier) {
             const user = await resolveUser2(invoice.customer, invoice.customer_email ?? void 0);
             if (user && invoice.id && !await ledgerExistsForStripePI(invoice.id)) {
-              await creditMc(user.id, tier.credits_mc, LedgerOperation.SUBSCRIPTION, `${tier.label} subscription credits`, invoice.id);
+              await creditMc(user.id, tier.credits_mc, LedgerOperation.SUBSCRIPTION, `${tier.label} subscription credits`, invoice.id, { neverExpires: tier.credits_never_expire });
               await setSubscriptionTier(user.id, tier.tier, tier.concurrency, subId ?? user.subscription_id);
+              if (tier.includes_memory) {
+                const subscriptionId = subId ?? user.subscription_id;
+                await setMemoryPlan(user.id, "pro", subscriptionId ?? null);
+                await syncMemoryKeyPlan(user, resolveEffectiveMemoryPlan({ ...user, memory_plan: "pro" }));
+              }
               const credentials = await syncScheduledActionCredentials(user);
               if (!credentials.ok) console.warn("[stripe] scheduled-action credential sync failed:", credentials.error ?? "unknown error");
+              const connectionState = await getConnectedAccountBillingState(user.id);
+              const activeConnections = Math.max(0, connectionState?.quantity ?? 0);
+              if (activeConnections > 0) {
+                const feeMc = activeConnections * CONNECTED_ACTIVE_CONNECTION_MONTHLY_MC;
+                const feeDescription = `${activeConnections} connected account${activeConnections === 1 ? "" : "s"} renewal at ${CONNECTED_ACTIVE_CONNECTION_MONTHLY_CREDITS} credits/month`;
+                const feeDebit = await debitMcIdempotent(user.id, feeMc, LedgerOperation.CONNECTED_ACCOUNT_FEE, feeDescription, `connection-fee:${invoice.id}`);
+                if (!feeDebit.ok) {
+                  await setConnectedAccountBillingState({
+                    userId: user.id,
+                    stripeSubscriptionId: user.subscription_id,
+                    stripeSubscriptionItemId: null,
+                    priceId: connectionState?.price_id ?? null,
+                    quantity: activeConnections,
+                    status: "blocked",
+                    lastErrorCode: "insufficient_credits",
+                    synced: false
+                  });
+                }
+              }
             }
           }
         }
       }
       if (event.type === "customer.subscription.created" || event.type === "customer.subscription.updated") {
         const sub = event.data.object;
-        const priceId = sub.items.data[0]?.price?.id;
+        const priceId = findBasePlanItem(sub)?.price?.id ?? sub.items.data[0]?.price?.id;
         if (priceId && priceId in MEMORY_PLANS) {
           const mem = MEMORY_PLANS[priceId];
           const user2 = await resolveUser2(sub.customer, sub.customer_email);
@@ -40430,6 +40694,14 @@ var init_stripe_routes = __esm({
           const live = sub.status === "active" || sub.status === "trialing";
           const newTier = live ? tier.tier : null;
           await setSubscriptionTier(user.id, newTier, live ? tier.concurrency : 0, live ? sub.id : null);
+          if (tier.includes_memory) {
+            const newMemoryPlan = live ? "pro" : "free";
+            await setMemoryPlan(user.id, newMemoryPlan, live ? sub.id : null);
+            await syncMemoryKeyPlan(user, resolveEffectiveMemoryPlan({ ...user, memory_plan: newMemoryPlan }));
+          } else if (user.memory_subscription_id === sub.id) {
+            await setMemoryPlan(user.id, "free", null);
+            await syncMemoryKeyPlan(user, resolveEffectiveMemoryPlan({ ...user, memory_plan: "free" }));
+          }
           if (live) {
             const credentials = await syncScheduledActionCredentials(user);
             if (!credentials.ok) console.warn("[stripe] scheduled-action credential sync failed:", credentials.error ?? "unknown error");
@@ -40441,7 +40713,19 @@ var init_stripe_routes = __esm({
       }
       if (event.type === "customer.subscription.deleted") {
         const sub = event.data.object;
-        const priceId = sub.items.data[0]?.price?.id;
+        const priceId = findBasePlanItem(sub)?.price?.id ?? sub.items.data[0]?.price?.id;
+        if (priceId && priceId in SUBSCRIPTION_TIERS) {
+          const tier = SUBSCRIPTION_TIERS[priceId];
+          const user2 = await getUserByStripeCustomerId(sub.customer);
+          if (user2) {
+            await setSubscriptionTier(user2.id, null, 0, null);
+            if (tier.includes_memory || user2.memory_subscription_id === sub.id) {
+              await setMemoryPlan(user2.id, "free", null);
+              await syncMemoryKeyPlan(user2, resolveEffectiveMemoryPlan({ ...user2, memory_plan: "free" }));
+            }
+          }
+          return c.json({ received: true });
+        }
         if (priceId && priceId in MEMORY_PLANS || await resolveUserByMemorySubscription(sub.id)) {
           const user2 = await resolveUserByMemorySubscription(sub.id) ?? await getUserByStripeCustomerId(sub.customer);
           if (user2) {
@@ -40452,9 +40736,7 @@ var init_stripe_routes = __esm({
         }
         const user = await getUserByStripeCustomerId(sub.customer);
         if (!user) return c.json({ received: true });
-        if (priceId && priceId in SUBSCRIPTION_TIERS) {
-          await setSubscriptionTier(user.id, null, 0, null);
-        } else if (priceId === CONCURRENCY_PRICE_ID) {
+        if (priceId === CONCURRENCY_PRICE_ID) {
           await setExtraConcurrencySlots(user.id, Math.max(0, user.extra_concurrency_slots - 1));
           await setConcurrencySubId(user.id, null);
         }
@@ -40514,9 +40796,9 @@ function negotiateScope(requested, user, resource) {
   const filtered = wanted.filter((s) => MEMORY_SCOPES.includes(s));
   const base = filtered.length > 0 ? filtered : ["memory.read", "memory.write"];
   const allowed = base.filter((s) => s === "memory.admin" ? operator : true);
-  const unique = [...new Set(allowed)];
-  if (operator && !unique.includes("memory.admin")) unique.push("memory.admin");
-  return unique.join(" ");
+  const unique2 = [...new Set(allowed)];
+  if (operator && !unique2.includes("memory.admin")) unique2.push("memory.admin");
+  return unique2.join(" ");
 }
 async function sessionUser(token) {
   if (!token) return null;
@@ -42289,48 +42571,231 @@ var init_schedule_routes = __esm({
   }
 });
 
-// src/api/resend-inbound-routes.ts
-function classifyInboundRecipients(recipients, ...receivingDomains) {
-  const normalized = recipients.map((address) => address.trim().toLowerCase());
-  const domains = receivingDomains.map((domain) => domain?.trim().toLowerCase()).filter((domain) => Boolean(domain));
-  const supportAddresses = [SUPPORT_ADDRESS, ...domains.map((domain) => `support@${domain}`)];
-  const dmarcAddresses = [DMARC_ADDRESS, ...domains.map((domain) => `dmarc@${domain}`)];
-  if (supportAddresses.some((address) => normalized.includes(address))) return "support";
-  if (dmarcAddresses.some((address) => normalized.includes(address))) return "dmarc";
-  return "ignore";
-}
-function cleanLine(value, fallback) {
-  const clean2 = value.replace(/[\r\n\t]+/g, " ").replace(/\s+/g, " ").trim();
-  return (clean2 || fallback).slice(0, 240);
+// src/api/resend-support-thread.ts
+function cleanLine(value, fallback, max = 240) {
+  const clean2 = String(value ?? "").replace(/[\r\n\t]+/g, " ").replace(/\s+/g, " ").trim();
+  return (clean2 || fallback).slice(0, max);
 }
 function quoteUntrusted(value) {
-  const clean2 = value.replace(/\0/g, "").trim().slice(0, 16e3);
+  const clean2 = String(value ?? "").replace(/\0/g, "").trim().slice(0, 16e3);
   if (!clean2) return "> _(No plain-text body was available. Review the forwarded email.)_";
   return clean2.split("\n").map((line) => `> ${line}`).join("\n");
 }
-function escapeHtml3(value) {
-  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
+function shortHash(value, length = 24) {
+  return (0, import_node_crypto19.createHash)("sha256").update(value).digest("hex").slice(0, length);
 }
-function safeEmailId(value) {
-  return value.replace(/[^a-zA-Z0-9_-]/g, "").slice(0, 100) || "unknown-email";
+function safePathPart(value) {
+  return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48) || "contact";
+}
+function parseMailbox(value) {
+  const raw = cleanLine(value, "", 500);
+  if (!raw) return null;
+  const angle = raw.match(/^(.*?)<([^<>]+)>$/);
+  const candidate = (angle?.[2] ?? raw).trim().toLowerCase();
+  const emailMatch = candidate.match(/[a-z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-z0-9](?:[a-z0-9.-]*[a-z0-9])?/i);
+  if (!emailMatch) return null;
+  const email = emailMatch[0].toLowerCase();
+  const suppliedName = angle?.[1]?.trim().replace(/^["']|["']$/g, "");
+  return { email, name: cleanLine(suppliedName, email) };
+}
+function supportSender(email) {
+  return parseMailbox(email.reply_to?.[0]) ?? parseMailbox(email.from);
+}
+function normalizeSupportSubject(value) {
+  let subject = cleanLine(value, "(no subject)", 240);
+  for (let i = 0; i < 8; i += 1) {
+    const next = subject.replace(/^\[(?:support|external)\]\s*/i, "").replace(/^(?:re|fw|fwd)\s*:\s*/i, "").trim();
+    if (next === subject) break;
+    subject = next;
+  }
+  return subject || "(no subject)";
+}
+function supportThreadToken(customerEmail, normalizedSubject) {
+  return shortHash(`${customerEmail.trim().toLowerCase()}
+${normalizeSupportSubject(normalizedSubject).toLowerCase()}`);
+}
+function supportThreadAddress(token, receivingDomain) {
+  const safeToken = token.toLowerCase().replace(/[^a-f0-9]/g, "").slice(0, 24);
+  const domain = receivingDomain.trim().toLowerCase();
+  if (!safeToken || !/^[a-z0-9.-]+\.[a-z]{2,}$/i.test(domain)) throw new Error("invalid support thread address");
+  return `support+${safeToken}@${domain}`;
+}
+function isAutomatedMailbox(email) {
+  const local = email.toLowerCase().split("@", 1)[0];
+  return /^(?:no-?reply|do-?not-?reply|mailer-daemon|postmaster|dmarc|bounce|notifications?)$/.test(local);
+}
+function extractReplyText(value) {
+  const text2 = String(value ?? "").replace(/\0/g, "").trim();
+  if (!text2) return "";
+  const lines = text2.split(/\r?\n/);
+  const kept = [];
+  for (const line of lines) {
+    if (/^On .+ wrote:\s*$/i.test(line.trim())) break;
+    if (/^-{2,}\s*Forwarded message\s*-{2,}$/i.test(line.trim())) break;
+    if (/^From:\s+MCP Scraper Support\b/i.test(line.trim())) break;
+    if (/^>\s?/.test(line)) break;
+    kept.push(line);
+  }
+  return kept.join("\n").trim().slice(0, 16e3);
+}
+function personPath(identity) {
+  const local = identity.email.split("@")[0];
+  return `contacts/${safePathPart(identity.name === identity.email ? local : identity.name)}-${shortHash(identity.email, 12)}`;
+}
+function issuePath(token) {
+  return `support/threads/${token}`;
+}
+function communicationPath(email) {
+  const date = cleanLine(email.created_at, (/* @__PURE__ */ new Date()).toISOString()).slice(0, 10).replace(/[^0-9-]/g, "");
+  const id = email.id.replace(/[^a-zA-Z0-9_-]/g, "").slice(0, 100) || shortHash(email.message_id || email.id);
+  return `Email/${date || (/* @__PURE__ */ new Date()).toISOString().slice(0, 10)}-${id}`;
+}
+function noteRef(vault, path6) {
+  return `${vault}::${path6.replace(/\.md$/i, "")}.md`;
+}
+function unique(values) {
+  return [...new Set(values.filter((value) => typeof value === "string" && value.trim().length > 0))];
+}
+function searchPath(source) {
+  if (!source?.startsWith("note:")) return null;
+  const path6 = source.slice("note:".length).trim();
+  return path6 || null;
+}
+async function getNote(memoryKey, vault, path6) {
+  const result = await memoryCall("getTool", { vault, path: path6 }, memoryKey);
+  return result.ok && result.note ? result.note : null;
+}
+async function inspectTagVocabulary(memoryKey) {
+  const result = await memoryCall("listTagsTool", {}, memoryKey);
+  if (!result.ok) throw new Error(result.error ?? "tag vocabulary could not be inspected");
 }
-function buildSupportIssueNote(email) {
-  const sender = cleanLine(email.from, "unknown sender");
-  const subject = cleanLine(email.subject, "(no subject)");
-  const receivedAt = cleanLine(email.created_at, (/* @__PURE__ */ new Date()).toISOString());
-  const attachments = email.attachments?.length ? email.attachments.map((item) => cleanLine(item.filename ?? "unnamed attachment", "unnamed attachment")).join(", ") : "None";
-  const datePrefix = receivedAt.slice(0, 10).replace(/[^0-9-]/g, "") || (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-  const path6 = `support/inbound/${datePrefix}-${safeEmailId(email.id)}`;
-  const title = `Support email \u2014 ${subject} \u2014 ${sender}`.slice(0, 240);
-  const summary = `Inbound MCP Scraper support email from ${sender} about \u201C${subject}\u201D; awaiting review and response.`.slice(0, 500);
+async function captureNewNote(memoryKey, input) {
+  const existing = await getNote(memoryKey, input.vault, input.path);
+  if (existing) return existing;
+  const prepared = await memoryCall("prepareMemoryWriteTool", {
+    title: input.title,
+    content: input.content,
+    source: input.source,
+    type: input.type,
+    vault: input.vault,
+    tagCandidates: input.tagCandidates,
+    maxLinks: 4
+  }, memoryKey);
+  if (!prepared.ok) throw new Error(prepared.error ?? `${input.vault} memory preparation failed`);
+  const resolvedTags = unique(
+    (prepared.tagResolutions ?? []).filter((item) => item.action !== "omit").map((item) => item.tag ?? item.candidate)
+  );
+  const capture = await memoryCall("memoryCaptureTool", {
+    vault: input.vault,
+    path: input.path,
+    title: input.title,
+    content: input.content,
+    props: { ...input.props, tags: resolvedTags },
+    tagDecisions: input.tagCandidates
+  }, memoryKey);
+  if (!capture.ok && !capture.conflict) {
+    const detail = JSON.stringify(capture);
+    throw new Error(`${capture.error ?? `${input.vault} memory capture failed`}: ${detail.slice(0, 2e3)}`);
+  }
+  const stored = await getNote(memoryKey, input.vault, input.path);
+  if (!stored) throw new Error(`${input.vault} memory capture could not be read back`);
+  return stored;
+}
+async function findOrCreatePerson(memoryKey, customer, occurredAt) {
+  const result = await memoryCall("searchTool", {
+    vault: "People",
+    query: customer.email,
+    queries: [
+      customer.email,
+      `contact ${customer.email}`,
+      `support relationship ${customer.email}`
+    ],
+    metadata: { email: customer.email },
+    rerankTopN: 10
+  }, memoryKey);
+  if (!result.ok) throw new Error(result.error ?? "People lookup failed");
+  for (const candidate of result.results ?? []) {
+    const path7 = searchPath(candidate.source);
+    if (!path7 || candidate.vault !== "People") continue;
+    const note = await getNote(memoryKey, "People", path7);
+    if (note && String(note.props?.email ?? "").toLowerCase() === customer.email) return note;
+  }
+  const path6 = personPath(customer);
+  const existing = await getNote(memoryKey, "People", path6);
+  if (existing) return existing;
+  const title = customer.name === customer.email ? customer.email : `${customer.name} \u2014 ${customer.email}`;
+  const summary = `MCP Scraper support contact identified by the verified sender email ${customer.email}.`;
   const content = [
+    "## Identity",
+    "",
+    `- Name: ${customer.name}`,
+    `- Email: ${customer.email}`,
+    "",
+    "## Relationship",
+    "",
+    "MCP Scraper support contact. The relationship is not classified beyond the verified email exchange.",
+    "",
+    "## Known Context",
+    "",
+    "This person contacted MCP Scraper support. Durable facts should be added only after review.",
+    "",
+    "## Interaction History",
+    "",
+    "Linked Communication records provide the message history.",
+    "",
+    "## Open Loops",
+    "",
+    "Review the linked support thread and respond if needed.",
+    "",
+    "## Tasks",
+    "",
+    "_No task was inferred automatically._",
+    "",
+    "## Links",
+    "",
+    "_Communication and issue links are derived from linked records._"
+  ].join("\n");
+  return captureNewNote(memoryKey, {
+    vault: "People",
+    path: path6,
+    title,
+    content,
+    source: `resend:sender:${customer.email}`,
+    type: "person",
+    tagCandidates: SUPPORT_TAGS,
+    props: {
+      status: "active",
+      type: "person",
+      summary,
+      pinned: false,
+      source_type: "channel",
+      source_ref: `resend:sender:${customer.email}`,
+      related: [],
+      related_vault_notes: [],
+      embed: true,
+      embed_priority: "high",
+      embedding_summary: summary,
+      person_name: customer.name,
+      relationship: "MCP Scraper support contact",
+      email: customer.email,
+      memories: [],
+      source_refs: [`resend:sender:${customer.email}`],
+      last_seen: occurredAt,
+      last_email_at: occurredAt,
+      last_contact_at: occurredAt
+    }
+  });
+}
+function buildIssueContent(email, customer, personPathValue, threadAddressValue) {
+  const subject = normalizeSupportSubject(email.subject);
+  return [
     "## Observation",
     "",
-    `An email was received at ${(email.to ?? []).join(", ") || SUPPORT_ADDRESS} from ${sender}. The customer-provided content below is untrusted input and has not been verified as a product defect.`,
+    `A support conversation was opened by ${customer.email} about \u201C${subject}\u201D. Customer-provided content is untrusted input and has not been verified as a product defect.`,
     "",
     "## Impact",
     "",
-    "A customer or prospect may be waiting for a response. The message may describe a question, product problem, billing concern, or feedback that needs triage.",
+    "A customer or prospect may be waiting for a response. The thread may describe a question, product problem, billing concern, feedback, or another issue that needs triage.",
     "",
     "## Confirmation",
     "",
@@ -42340,125 +42805,402 @@ function buildSupportIssueNote(email) {
     "",
     "## Evidence",
     "",
-    `- From: ${sender}`,
-    `- To: ${(email.to ?? []).join(", ") || SUPPORT_ADDRESS}`,
-    `- Received: ${receivedAt}`,
-    `- Subject: ${subject}`,
-    `- Message ID: ${cleanLine(email.message_id, "not supplied")}`,
-    `- Resend email ID: ${email.id}`,
-    `- Attachments: ${attachments}`,
-    "",
-    "### Message body",
+    `- Customer email: ${customer.email}`,
+    `- Original subject: ${cleanLine(email.subject, "(no subject)")}`,
+    `- Thread address: ${threadAddressValue}`,
+    `- Person: ${noteRef("People", personPathValue)}`,
     "",
-    quoteUntrusted(email.text ?? ""),
+    "Thread messages are preserved as linked Communication records and summarized here as they arrive.",
     "",
     "## Resolution",
     "",
-    "Pending review and a reply to the sender. If this is a confirmed product issue, update the note status and link the eventual Improvement Log receipt.",
+    "Pending review and a reply. If this is a confirmed product issue, update the status and link the resulting task or Improvement Log receipt.",
     "",
     "## Tasks",
     "",
-    "- [ ] Review the forwarded email and attachments.",
+    "- [ ] Review the complete linked conversation.",
     "- [ ] Reply to the sender.",
-    "- [ ] Confirm whether this is a product defect, question, billing concern, or feedback.",
-    "- [ ] Link any resulting task or Improvement Log receipt.",
+    "- [ ] Classify the thread as a question, product defect, billing concern, feedback, or another issue.",
     "",
     "## Links",
     "",
-    "_No automatic links were added; support messages should be linked during human triage to avoid false relationships._"
+    `- Person: ${noteRef("People", personPathValue)}`
   ].join("\n");
-  return { path: path6, title, content, summary };
-}
-async function captureSupportIssue(email, memoryKey) {
-  const note = buildSupportIssueNote(email);
-  const tagCandidates = [
-    { tag: "customer-support", central: true, reusable: true, description: "Inbound and in-product MCP Scraper customer support requests." },
-    { tag: "inbound-email", central: true, reusable: true, description: "Messages received through an inbound email integration." },
-    { tag: "product-feedback", central: true, reusable: true, description: "Customer feedback and reported product problems." }
-  ];
-  const prepared = await memoryCall("prepareMemoryWriteTool", {
-    title: note.title,
-    content: note.content,
-    source: `resend:email:${email.id}`,
-    type: "user_friction",
-    vault: "Issues",
-    tagCandidates,
-    maxLinks: 4
-  }, memoryKey);
-  if (!prepared.ok) throw new Error(prepared.error ?? "memory preparation failed");
-  const resolvedTags = (prepared.tagResolutions ?? []).filter((item) => item.action !== "omit").map((item) => item.tag ?? item.candidate).filter((tag) => Boolean(tag));
-  const capture = await memoryCall("memoryCaptureTool", {
+}
+async function findOrCreateIssue(memoryKey, email, customer, personPathValue, token, threadAddressValue) {
+  const path6 = issuePath(token);
+  const existing = await getNote(memoryKey, "Issues", path6);
+  if (existing) return existing;
+  const subject = normalizeSupportSubject(email.subject);
+  const summary = `Support conversation with ${customer.email} about \u201C${subject}\u201D; full history is linked through Communication records.`;
+  return captureNewNote(memoryKey, {
     vault: "Issues",
-    path: note.path,
-    title: note.title,
-    content: note.content,
+    path: path6,
+    title: `Support thread \u2014 ${subject} \u2014 ${customer.email}`.slice(0, 240),
+    content: buildIssueContent(email, customer, personPathValue, threadAddressValue),
+    source: `resend:thread:${token}`,
+    type: "user_friction",
+    tagCandidates: ISSUE_TAGS,
     props: {
       status: "ai_observed",
-      summary: note.summary,
-      tags: resolvedTags,
+      type: "user_friction",
+      summary,
       pinned: false,
-      source_type: "channel",
-      source_ref: `resend:email:${email.id}`,
+      source_type: "thread",
+      source_ref: `resend:thread:${token}`,
       related: [],
-      related_vault_notes: [],
+      related_vault_notes: [noteRef("People", personPathValue)],
       embed: true,
       embed_priority: "high",
-      embedding_summary: note.summary,
-      type: "user_friction",
+      embedding_summary: summary,
       severity: "untriaged",
       system: "MCP Scraper customer support",
       observed_at: email.created_at,
       detected_by: "resend-email-webhook",
-      reproducible: false
+      reproducible: false,
+      person_refs: [personPathValue],
+      customer_email: customer.email,
+      customer_name: customer.name,
+      normalized_subject: subject,
+      thread_token: token,
+      thread_address: threadAddressValue,
+      communication_refs: [],
+      message_count: 0,
+      attention_state: "needs_reply"
+    }
+  });
+}
+function buildCommunicationContent(email, customer, direction, personPathValue, issuePathValue, parentPath) {
+  const sender = supportSender(email);
+  const body = direction === "outbound" ? extractReplyText(email.text) : email.text;
+  const participants = direction === "inbound" ? `- From: ${sender?.email ?? email.from}
+- To: MCP Scraper support` : `- From: MCP Scraper support
+- To: ${customer.email}`;
+  return [
+    "## Summary",
+    "",
+    `${direction === "inbound" ? "Inbound" : "Outbound"} support email in the \u201C${normalizeSupportSubject(email.subject)}\u201D thread.`,
+    "",
+    "## Participants",
+    "",
+    participants,
+    `- Person: ${noteRef("People", personPathValue)}`,
+    "",
+    "## Message",
+    "",
+    quoteUntrusted(body),
+    "",
+    "## Decision",
+    "",
+    "_No decision was inferred automatically._",
+    "",
+    "## Follow Up Tasks",
+    "",
+    direction === "inbound" ? "- [ ] Review and reply." : "- [ ] Wait for the customer response or close the thread after review.",
+    "",
+    "## Links",
+    "",
+    `- Issue: ${noteRef("Issues", issuePathValue)}`,
+    `- Person: ${noteRef("People", personPathValue)}`,
+    ...parentPath ? [`- Previous message: [[${parentPath}]]`] : []
+  ].join("\n");
+}
+async function captureCommunication(memoryKey, email, customer, direction, personPathValue, issuePathValue, token, parentPath) {
+  const path6 = communicationPath(email);
+  const existing = await getNote(memoryKey, "Communication", path6);
+  if (existing) return existing;
+  const subject = normalizeSupportSubject(email.subject);
+  const summary = `${direction === "inbound" ? "Inbound message from" : "Outbound reply to"} ${customer.email} in the support thread about \u201C${subject}\u201D.`;
+  const providerMessageRef = cleanLine(email.message_id, email.id, 500);
+  return captureNewNote(memoryKey, {
+    vault: "Communication",
+    path: path6,
+    title: `${direction === "inbound" ? "Inbound" : "Outbound"} email \u2014 ${subject} \u2014 ${customer.email}`.slice(0, 240),
+    content: buildCommunicationContent(email, customer, direction, personPathValue, issuePathValue, parentPath),
+    source: `resend:email:${email.id}`,
+    type: "email",
+    tagCandidates: SUPPORT_TAGS,
+    props: {
+      status: direction === "inbound" ? "inbox" : "responded",
+      type: "email",
+      summary,
+      pinned: false,
+      source_type: "channel",
+      source_ref: `resend:email:${email.id}`,
+      related: parentPath ? [`[[${parentPath}]]`] : [],
+      related_vault_notes: [
+        noteRef("People", personPathValue),
+        noteRef("Issues", issuePathValue)
+      ],
+      embed: true,
+      embed_priority: "high",
+      embedding_summary: summary,
+      channel: "email",
+      participants: [customer.email, "support@updates.mcpscraper.dev"],
+      person_refs: [personPathValue],
+      occurred_at: email.created_at,
+      direction,
+      attention_state: direction === "inbound" ? "needs_reply" : "waiting",
+      provider: "resend",
+      provider_connection_ref: "resend:updates.mcpscraper.dev",
+      provider_message_ref: providerMessageRef,
+      provider_thread_ref: token,
+      thread_ref: token,
+      issue_ref: issuePathValue,
+      sender_email: supportSender(email)?.email ?? email.from,
+      recipient_emails: email.to ?? [],
+      parentMessageId: parentPath,
+      parent_communication_ref: parentPath
+    }
+  });
+}
+function appendIssueEvidence(content, email, communicationPathValue, direction) {
+  const marker = `- Resend email ID: ${email.id}`;
+  if (content.includes(marker)) return content;
+  const block = [
+    `### ${direction === "inbound" ? "Inbound" : "Outbound"} email \u2014 ${cleanLine(email.created_at, (/* @__PURE__ */ new Date()).toISOString())}`,
+    "",
+    `- Communication: ${noteRef("Communication", communicationPathValue)}`,
+    `- Subject: ${cleanLine(email.subject, "(no subject)")}`,
+    marker,
+    `- Message ID: ${cleanLine(email.message_id, "not supplied", 500)}`,
+    "",
+    quoteUntrusted(direction === "outbound" ? extractReplyText(email.text) : email.text),
+    ""
+  ].join("\n");
+  const anchor = "\n## Resolution";
+  return content.includes(anchor) ? content.replace(anchor, `
+${block}${anchor}`) : `${content}
+
+${block}`;
+}
+async function updateIssueThread(memoryKey, issuePathValue, email, communicationPathValue, direction, personPathValue) {
+  for (let attempt = 0; attempt < 2; attempt += 1) {
+    const current = await getNote(memoryKey, "Issues", issuePathValue);
+    if (!current) throw new Error("support thread issue disappeared before update");
+    const currentRefs = unique(Array.isArray(current.props?.communication_refs) ? current.props.communication_refs : []);
+    const alreadyLinked = currentRefs.includes(communicationPathValue);
+    const communicationRefs = alreadyLinked ? currentRefs : [...currentRefs, communicationPathValue];
+    const relatedVaultNotes = unique([
+      ...Array.isArray(current.props?.related_vault_notes) ? current.props.related_vault_notes : [],
+      noteRef("People", personPathValue),
+      ...communicationRefs.map((path6) => noteRef("Communication", path6))
+    ]);
+    const result = await memoryCall("putTool", {
+      vault: "Issues",
+      path: issuePathValue,
+      title: current.title,
+      content: appendIssueEvidence(current.content, email, communicationPathValue, direction),
+      baseRevision: current.revision,
+      props: {
+        related_vault_notes: relatedVaultNotes,
+        communication_refs: communicationRefs,
+        last_communication_ref: communicationPathValue,
+        last_message_at: email.created_at,
+        message_count: communicationRefs.length,
+        attention_state: direction === "inbound" ? "needs_reply" : "waiting"
+      }
+    }, memoryKey);
+    if (result.ok) return;
+    if (!result.conflict || attempt === 1) throw new Error(result.error ?? "support thread issue update failed");
+  }
+}
+async function getSupportThreadByToken(memoryKey, token) {
+  const safeToken = token.toLowerCase().replace(/[^a-f0-9]/g, "").slice(0, 24);
+  if (safeToken.length !== 24) return null;
+  const path6 = issuePath(safeToken);
+  const issue = await getNote(memoryKey, "Issues", path6);
+  if (!issue) return null;
+  const customerEmail = parseMailbox(String(issue.props?.customer_email ?? ""));
+  const personRefs = Array.isArray(issue.props?.person_refs) ? issue.props.person_refs : [];
+  const personPathValue = personRefs.find((value) => typeof value === "string");
+  const threadAddressValue = String(issue.props?.thread_address ?? "");
+  if (!customerEmail || !personPathValue || !threadAddressValue) return null;
+  return {
+    issue,
+    issuePath: path6,
+    threadToken: safeToken,
+    threadAddress: threadAddressValue,
+    customer: {
+      email: customerEmail.email,
+      name: cleanLine(String(issue.props?.customer_name ?? ""), customerEmail.email)
     },
-    tagDecisions: tagCandidates
-  }, memoryKey);
-  if (capture.ok) return capture.note?.path ?? note.path;
-  if (capture.conflict) {
-    const existing = await memoryCall("getTool", { vault: "Issues", path: note.path }, memoryKey);
-    if (existing.ok) return note.path;
+    personPath: personPathValue,
+    normalizedSubject: cleanLine(String(issue.props?.normalized_subject ?? ""), "(no subject)")
+  };
+}
+async function captureSupportMessage(memoryKey, email, options) {
+  await inspectTagVocabulary(memoryKey);
+  const customer = options.customer ?? supportSender(email);
+  if (!customer) throw new Error("support sender does not contain a usable email address");
+  const normalizedSubject = options.existingThread?.normalizedSubject ?? normalizeSupportSubject(email.subject);
+  const token = options.existingThread?.threadToken ?? supportThreadToken(customer.email, normalizedSubject);
+  const threadAddressValue = options.existingThread?.threadAddress ?? supportThreadAddress(token, options.receivingDomain);
+  const person = options.existingThread ? await getNote(memoryKey, "People", options.existingThread.personPath) : await findOrCreatePerson(memoryKey, customer, email.created_at);
+  if (!person) throw new Error("support person could not be resolved");
+  const issue = options.existingThread?.issue ?? await findOrCreateIssue(
+    memoryKey,
+    email,
+    customer,
+    person.path,
+    token,
+    threadAddressValue
+  );
+  const parentPath = typeof issue.props?.last_communication_ref === "string" ? issue.props.last_communication_ref : void 0;
+  const communication = await captureCommunication(
+    memoryKey,
+    email,
+    customer,
+    options.direction,
+    person.path,
+    issue.path,
+    token,
+    parentPath
+  );
+  await updateIssueThread(memoryKey, issue.path, email, communication.path, options.direction, person.path);
+  return {
+    issuePath: issue.path,
+    communicationPath: communication.path,
+    personPath: person.path,
+    parentCommunicationPath: parentPath,
+    threadToken: token,
+    threadAddress: threadAddressValue,
+    customerEmail: customer.email,
+    normalizedSubject,
+    direction: options.direction
+  };
+}
+var import_node_crypto19, SUPPORT_TAGS, ISSUE_TAGS;
+var init_resend_support_thread = __esm({
+  "src/api/resend-support-thread.ts"() {
+    "use strict";
+    import_node_crypto19 = require("crypto");
+    init_memory();
+    SUPPORT_TAGS = [
+      {
+        tag: "support",
+        central: true,
+        reusable: true,
+        description: "Customer support work, context, and follow-up."
+      },
+      {
+        tag: "customer-support",
+        central: true,
+        reusable: true,
+        description: "Inbound and in-product MCP Scraper customer support requests."
+      },
+      {
+        tag: "inbound-email",
+        central: true,
+        reusable: true,
+        description: "Messages received through an inbound email integration."
+      }
+    ];
+    ISSUE_TAGS = [
+      ...SUPPORT_TAGS,
+      {
+        tag: "product-feedback",
+        central: true,
+        reusable: true,
+        description: "Customer feedback and reported product problems."
+      }
+    ];
+  }
+});
+
+// src/api/resend-inbound-routes.ts
+function receivingDomains(values) {
+  return values.map((domain) => domain?.trim().toLowerCase()).filter((domain) => Boolean(domain));
+}
+function extractSupportThreadToken(recipients, ...domainsInput) {
+  const domains = receivingDomains(domainsInput);
+  for (const recipient of recipients) {
+    const address = parseMailbox(recipient)?.email ?? recipient.trim().toLowerCase();
+    const match = address.match(/^support\+([a-f0-9]{24})@(.+)$/i);
+    if (match && domains.includes(match[2].toLowerCase())) return match[1].toLowerCase();
   }
-  throw new Error(capture.error ?? "memory capture failed");
+  return null;
+}
+function classifyInboundRecipients(recipients, ...domainsInput) {
+  const normalized = recipients.map((address) => parseMailbox(address)?.email ?? address.trim().toLowerCase());
+  const domains = receivingDomains(domainsInput);
+  const supportAddresses = [SUPPORT_ADDRESS, ...domains.map((domain) => `support@${domain}`)];
+  const dmarcAddresses = [DMARC_ADDRESS, ...domains.map((domain) => `dmarc@${domain}`)];
+  if (dmarcAddresses.some((address) => normalized.includes(address))) return "dmarc";
+  if (extractSupportThreadToken(recipients, ...domains)) return "support-thread";
+  if (supportAddresses.some((address) => normalized.includes(address))) return "support";
+  return "ignore";
+}
+function escapeHtml3(value) {
+  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
+}
+function safeEmailId(value) {
+  return value.replace(/[^a-zA-Z0-9_-]/g, "").slice(0, 100) || "unknown-email";
 }
-async function forwardReceivedEmail(resend, email, destination, label) {
+async function receivedAttachments(resend, email) {
   const attachmentResult = await resend.emails.receiving.attachments.list({ emailId: email.id });
   if (attachmentResult.error) throw new Error(`attachment retrieval failed: ${attachmentResult.error.message}`);
-  const attachments = (attachmentResult.data?.data ?? []).filter((item) => item.content_disposition !== "inline").map((item) => ({
+  return (attachmentResult.data?.data ?? []).filter((item) => item.content_disposition !== "inline").map((item) => ({
     path: item.download_url,
     filename: item.filename ?? "attachment",
     contentId: item.content_id
   }));
-  const sender = email.reply_to?.[0] || email.from;
-  const subject = cleanLine(email.subject, "(no subject)");
+}
+async function forwardSupportEmail(resend, email, destination, threadAddress) {
+  const attachments = await receivedAttachments(resend, email);
+  const sender = supportSender(email);
+  const subject = normalizeSupportSubject(email.subject);
   const headerText = [
-    `${label} message received at ${(email.to ?? []).join(", ")}`,
+    `Support message received at ${(email.to ?? []).join(", ")}`,
     `From: ${email.from}`,
-    `Reply to: ${sender}`,
+    `Customer email: ${sender?.email ?? email.from}`,
     `Received: ${email.created_at}`,
+    `Thread reply address: ${threadAddress}`,
     ""
   ].join("\n");
   const headerHtml = [
     '<div style="font-family:Arial,sans-serif;font-size:13px;line-height:1.5;color:#5f5a54;border-bottom:1px solid #e9e4db;padding-bottom:12px;margin-bottom:18px">',
-    `<strong>${label} message received</strong><br>`,
+    "<strong>Support message received</strong><br>",
     `From: ${escapeHtml3(email.from)}<br>`,
-    `Reply to: ${escapeHtml3(sender)}<br>`,
-    `Received: ${escapeHtml3(email.created_at)}`,
+    `Customer email: ${escapeHtml3(sender?.email ?? email.from)}<br>`,
+    `Received: ${escapeHtml3(email.created_at)}<br>`,
+    `Thread reply address: ${escapeHtml3(threadAddress)}`,
     "</div>"
   ].join("");
   const sent = await resend.emails.send({
     from: FORWARD_FROM,
     to: destination,
-    replyTo: sender,
-    subject: `[${label}] ${subject}`,
+    replyTo: threadAddress,
+    subject: `[Support] ${subject}`,
     text: `${headerText}${email.text || "(HTML-only message; view the HTML version.)"}`,
     html: email.html ? `${headerHtml}${email.html}` : void 0,
     attachments: attachments.length ? attachments : void 0,
+    headers: { "X-MCP-Support-Thread": threadAddress },
+    tags: [
+      { name: "category", value: "support_forward" },
+      { name: "inbound_id", value: safeEmailId(email.id) }
+    ]
+  }, { idempotencyKey: `mcp-inbound-support-${safeEmailId(email.id)}` });
+  if (sent.error) throw new Error(`support forward failed: ${sent.error.message}`);
+  return sent.data.id;
+}
+async function relayOperatorReply(resend, email, customerEmail, threadAddress, normalizedSubject) {
+  const attachments = await receivedAttachments(resend, email);
+  const replyText = extractReplyText(email.text) || "(No plain-text reply was available.)";
+  const sent = await resend.emails.send({
+    from: FORWARD_FROM,
+    to: customerEmail,
+    replyTo: threadAddress,
+    subject: `Re: ${normalizeSupportSubject(normalizedSubject)}`,
+    text: replyText,
+    attachments: attachments.length ? attachments : void 0,
+    headers: { "X-MCP-Support-Thread": threadAddress },
     tags: [
-      { name: "category", value: label === "Support" ? "support_forward" : "dmarc_report" },
+      { name: "category", value: "support_reply" },
       { name: "inbound_id", value: safeEmailId(email.id) }
     ]
-  }, { idempotencyKey: `mcp-inbound-${label.toLowerCase()}-${safeEmailId(email.id)}` });
-  if (sent.error) throw new Error(`forward failed: ${sent.error.message}`);
+  }, { idempotencyKey: `mcp-support-reply-${safeEmailId(email.id)}` });
+  if (sent.error) throw new Error(`support reply relay failed: ${sent.error.message}`);
   return sent.data.id;
 }
 var import_hono24, import_resend, SUPPORT_ADDRESS, DMARC_ADDRESS, FORWARD_FROM, resendInboundApp;
@@ -42467,7 +43209,7 @@ var init_resend_inbound_routes = __esm({
     "use strict";
     import_hono24 = require("hono");
     import_resend = require("resend");
-    init_memory();
+    init_resend_support_thread();
     SUPPORT_ADDRESS = "support@mcpscraper.dev";
     DMARC_ADDRESS = "dmarc@mcpscraper.dev";
     FORWARD_FROM = "MCP Scraper Support <support@updates.mcpscraper.dev>";
@@ -42494,32 +43236,99 @@ var init_resend_inbound_routes = __esm({
       }
       if (event.type !== "email.received") return c.json({ ok: true, ignored: true });
       const receivedEvent = event;
-      const route = classifyInboundRecipients(
-        receivedEvent.data.to ?? [],
+      const domains = [
         process.env.RESEND_RECEIVING_DOMAIN,
         process.env.RESEND_MANAGED_RECEIVING_DOMAIN
-      );
-      if (route === "ignore") return c.json({ ok: true, ignored: true });
+      ];
+      const route = classifyInboundRecipients(receivedEvent.data.to ?? [], ...domains);
+      if (route === "ignore") return c.json({ ok: true, route, ignored: true });
+      if (route === "dmarc") {
+        return c.json({ ok: true, route, ignored: true, reason: "dmarc-report-suppressed" });
+      }
       const received = await resend.emails.receiving.get(receivedEvent.data.email_id);
       if (received.error || !received.data) {
         console.error("[resend/inbound] could not retrieve received email", receivedEvent.data.email_id);
         return c.json({ error: "received email could not be retrieved" }, 502);
       }
+      const destination = process.env.SUPPORT_FORWARD_TO?.trim();
+      const memoryKey = process.env.SUPPORT_INBOX_MEMORY_KEY?.trim();
+      const receivingDomain = process.env.RESEND_RECEIVING_DOMAIN?.trim();
+      if (!destination || !memoryKey || !receivingDomain) {
+        return c.json({ error: "support routing is not configured" }, 503);
+      }
       try {
+        const email = received.data;
+        const sender = supportSender(email);
+        if (!sender || isAutomatedMailbox(sender.email)) {
+          return c.json({ ok: true, route, ignored: true, reason: "automated-or-unusable-sender" });
+        }
         if (route === "support") {
-          const destination2 = process.env.SUPPORT_FORWARD_TO?.trim();
-          const memoryKey = process.env.SUPPORT_INBOX_MEMORY_KEY?.trim();
-          if (!destination2 || !memoryKey) return c.json({ error: "support routing is not configured" }, 503);
-          const [forwardedId2, memoryPath] = await Promise.all([
-            forwardReceivedEmail(resend, received.data, destination2, "Support"),
-            captureSupportIssue(received.data, memoryKey)
-          ]);
-          return c.json({ ok: true, route, forwardedId: forwardedId2, memoryPath });
+          const captured = await captureSupportMessage(memoryKey, email, {
+            receivingDomain,
+            direction: "inbound",
+            customer: sender
+          });
+          const forwardedId = await forwardSupportEmail(resend, received.data, destination, captured.threadAddress);
+          return c.json({
+            ok: true,
+            route,
+            direction: "inbound",
+            forwardedId,
+            issuePath: captured.issuePath,
+            communicationPath: captured.communicationPath,
+            personPath: captured.personPath,
+            threadAddress: captured.threadAddress
+          });
         }
-        const destination = process.env.DMARC_FORWARD_TO?.trim() || process.env.SUPPORT_FORWARD_TO?.trim();
-        if (!destination) return c.json({ error: "DMARC routing is not configured" }, 503);
-        const forwardedId = await forwardReceivedEmail(resend, received.data, destination, "DMARC");
-        return c.json({ ok: true, route, forwardedId });
+        const token = extractSupportThreadToken(receivedEvent.data.to ?? [], ...domains);
+        const thread = token ? await getSupportThreadByToken(memoryKey, token) : null;
+        if (!thread) return c.json({ ok: true, route, ignored: true, reason: "unknown-support-thread" });
+        const operator = parseMailbox(destination);
+        if (operator && sender.email === operator.email) {
+          const captured = await captureSupportMessage(memoryKey, email, {
+            receivingDomain,
+            direction: "outbound",
+            customer: thread.customer,
+            existingThread: thread
+          });
+          const relayedId = await relayOperatorReply(
+            resend,
+            received.data,
+            thread.customer.email,
+            captured.threadAddress,
+            thread.normalizedSubject
+          );
+          return c.json({
+            ok: true,
+            route,
+            direction: "outbound",
+            relayedId,
+            issuePath: captured.issuePath,
+            communicationPath: captured.communicationPath,
+            personPath: captured.personPath,
+            threadAddress: captured.threadAddress
+          });
+        }
+        if (sender.email === thread.customer.email) {
+          const captured = await captureSupportMessage(memoryKey, email, {
+            receivingDomain,
+            direction: "inbound",
+            customer: thread.customer,
+            existingThread: thread
+          });
+          const forwardedId = await forwardSupportEmail(resend, received.data, destination, captured.threadAddress);
+          return c.json({
+            ok: true,
+            route,
+            direction: "inbound",
+            forwardedId,
+            issuePath: captured.issuePath,
+            communicationPath: captured.communicationPath,
+            personPath: captured.personPath,
+            threadAddress: captured.threadAddress
+          });
+        }
+        return c.json({ ok: true, route, ignored: true, reason: "unrecognized-thread-sender" });
       } catch (err) {
         console.error("[resend/inbound] processing failed", receivedEvent.data.email_id, err instanceof Error ? err.message : String(err));
         return c.json({ error: "inbound email processing failed" }, 502);
@@ -42572,7 +43381,7 @@ var init_site_audit_worker = __esm({
 
 // src/api/page-diff.ts
 function sha256Hex(value) {
-  return (0, import_node_crypto19.createHash)("sha256").update(value).digest("hex");
+  return (0, import_node_crypto20.createHash)("sha256").update(value).digest("hex");
 }
 function truncateForStorage(value, maxChars = MAX_SNAPSHOT_CONTENT_CHARS) {
   if (value.length <= maxChars) return { value, truncated: false };
@@ -42629,11 +43438,11 @@ function diffPageContent(oldContent, newContent) {
     totalChangedLineCount
   };
 }
-var import_node_crypto19, import_diff, MAX_SNAPSHOT_CONTENT_CHARS, MAX_DIFF_HUNKS, MAX_DIFF_LINES_PER_RESPONSE;
+var import_node_crypto20, import_diff, MAX_SNAPSHOT_CONTENT_CHARS, MAX_DIFF_HUNKS, MAX_DIFF_LINES_PER_RESPONSE;
 var init_page_diff = __esm({
   "src/api/page-diff.ts"() {
     "use strict";
-    import_node_crypto19 = require("crypto");
+    import_node_crypto20 = require("crypto");
     import_diff = require("diff");
     MAX_SNAPSHOT_CONTENT_CHARS = 25e4;
     MAX_DIFF_HUNKS = 200;
@@ -42710,7 +43519,7 @@ function canonicalJson(value) {
   return JSON.stringify(value);
 }
 function sha2562(value) {
-  return (0, import_node_crypto20.createHash)("sha256").update(value).digest("hex");
+  return (0, import_node_crypto21.createHash)("sha256").update(value).digest("hex");
 }
 function sensitiveKey(key) {
   const normalized = key.toLowerCase().replace(/[^a-z0-9]/g, "");
@@ -42925,11 +43734,11 @@ async function importServiceConnectionToMemory(identity, input, dependencies) {
     ...!searchReady ? { warning: "The snapshot was stored, but no search chunks were indexed yet." } : {}
   };
 }
-var import_node_crypto20, CONNECTION_MEMORY_IMPORT_MAX_ARGS_BYTES, CONNECTION_MEMORY_IMPORT_MAX_RESULT_BYTES, CONNECTION_MEMORY_IMPORT_MAX_STRING_CHARS, CONNECTION_MEMORY_IMPORT_MAX_DEPTH, ConnectionMemoryImportError;
+var import_node_crypto21, CONNECTION_MEMORY_IMPORT_MAX_ARGS_BYTES, CONNECTION_MEMORY_IMPORT_MAX_RESULT_BYTES, CONNECTION_MEMORY_IMPORT_MAX_STRING_CHARS, CONNECTION_MEMORY_IMPORT_MAX_DEPTH, ConnectionMemoryImportError;
 var init_connection_memory_import = __esm({
   "src/api/connection-memory-import.ts"() {
     "use strict";
-    import_node_crypto20 = require("crypto");
+    import_node_crypto21 = require("crypto");
     init_slugify();
     CONNECTION_MEMORY_IMPORT_MAX_ARGS_BYTES = 64 * 1024;
     CONNECTION_MEMORY_IMPORT_MAX_RESULT_BYTES = 1e6;
@@ -43103,7 +43912,7 @@ function finitePositive(value, fallback) {
   return Number.isFinite(value) && value > 0 ? value : fallback;
 }
 async function collectConnectedDataExport(args) {
-  const exportId = (0, import_node_crypto21.randomUUID)();
+  const exportId = (0, import_node_crypto22.randomUUID)();
   const now = args.now ?? Date.now;
   const startedAt = now();
   const budgetMs = finitePositive(CONNECTED_DATA_EXPORT_BUDGET_MS, 24e4);
@@ -43213,11 +44022,11 @@ ${lines.length ? `${lines.join("\n")}
     untrustedContent: true
   };
 }
-var import_node_crypto21, CONNECTED_DATA_INLINE_BUDGET_BYTES, CONNECTED_DATA_MAX_EXPORT_BYTES, CONNECTED_DATA_EXPORT_BUDGET_MS, CONNECTED_DATA_PAGE_START_HEADROOM_MS, CONNECTED_DATA_DATASETS, ConnectedDataExportValidationError;
+var import_node_crypto22, CONNECTED_DATA_INLINE_BUDGET_BYTES, CONNECTED_DATA_MAX_EXPORT_BYTES, CONNECTED_DATA_EXPORT_BUDGET_MS, CONNECTED_DATA_PAGE_START_HEADROOM_MS, CONNECTED_DATA_DATASETS, ConnectedDataExportValidationError;
 var init_connected_data_export = __esm({
   "src/api/connected-data-export.ts"() {
     "use strict";
-    import_node_crypto21 = require("crypto");
+    import_node_crypto22 = require("crypto");
     CONNECTED_DATA_INLINE_BUDGET_BYTES = Number(
       process.env.MCP_SCRAPER_CONNECTED_DATA_INLINE_BUDGET_BYTES ?? 5e4
     );
@@ -43330,7 +44139,7 @@ async function exportSearchConsoleTableData(args) {
     offset += rows.length;
     if (stoppedForBytes || rows.length < limit || offset >= matchedRows) break;
   }
-  const exportId = (0, import_node_crypto22.randomUUID)();
+  const exportId = (0, import_node_crypto23.randomUUID)();
   const artifact = await args.writeArtifact({
     ownerId: args.ownerId,
     exportId,
@@ -43352,11 +44161,11 @@ async function exportSearchConsoleTableData(args) {
     warnings
   };
 }
-var import_node_crypto22, SEARCH_CONSOLE_TABLE_EXPORT_MAX_ROWS, SEARCH_CONSOLE_TABLE_EXPORT_PAGE_SIZE, SEARCH_CONSOLE_TABLE_EXPORT_MAX_BYTES, SEARCH_CONSOLE_TABLE_COLUMNS, SearchConsoleTableExportValidationError;
+var import_node_crypto23, SEARCH_CONSOLE_TABLE_EXPORT_MAX_ROWS, SEARCH_CONSOLE_TABLE_EXPORT_PAGE_SIZE, SEARCH_CONSOLE_TABLE_EXPORT_MAX_BYTES, SEARCH_CONSOLE_TABLE_COLUMNS, SearchConsoleTableExportValidationError;
 var init_search_console_table_export = __esm({
   "src/api/search-console-table-export.ts"() {
     "use strict";
-    import_node_crypto22 = require("crypto");
+    import_node_crypto23 = require("crypto");
     SEARCH_CONSOLE_TABLE_EXPORT_MAX_ROWS = 5e4;
     SEARCH_CONSOLE_TABLE_EXPORT_PAGE_SIZE = 2e3;
     SEARCH_CONSOLE_TABLE_EXPORT_MAX_BYTES = 50 * 1024 * 1024;
@@ -43784,7 +44593,7 @@ async function reconcileDiscoveredNangoConnections(identity, discovered) {
           updated_at = excluded.updated_at
       `,
       args: [
-        (0, import_node_crypto23.randomUUID)(),
+        (0, import_node_crypto24.randomUUID)(),
         userId,
         connection.providerConfigKey,
         connection.provider,
@@ -43855,7 +44664,7 @@ async function recordServiceConnectionHealth(args) {
   });
   await getDb().execute({
     sql: `INSERT INTO service_connection_health_events (id, connection_id, operational_status, failure_code, retryable, evidence_source) VALUES (?, ?, ?, ?, ?, ?)`,
-    args: [(0, import_node_crypto23.randomUUID)(), args.connectionId, args.operationalStatus, args.failureCode ?? null, args.retryable == null ? null : args.retryable ? 1 : 0, args.evidenceSource]
+    args: [(0, import_node_crypto24.randomUUID)(), args.connectionId, args.operationalStatus, args.failureCode ?? null, args.retryable == null ? null : args.retryable ? 1 : 0, args.evidenceSource]
   });
 }
 async function setServiceConnectionActions(identity, connectionId, enabled) {
@@ -43895,7 +44704,7 @@ async function claimServiceConnectionAction(args) {
   if (!connection) throw new Error("service_connection_not_found");
   const inserted = await getDb().execute({
     sql: `INSERT OR IGNORE INTO service_connection_action_audit (id, connection_id, user_id, tool, request_id, status) VALUES (?, ?, ?, ?, ?, 'started')`,
-    args: [(0, import_node_crypto23.randomUUID)(), connection.id, connection.userId, args.tool, args.requestId]
+    args: [(0, import_node_crypto24.randomUUID)(), connection.id, connection.userId, args.tool, args.requestId]
   });
   if (Number(inserted.rowsAffected ?? 0) === 1) return { claimed: true };
   const existing = await getDb().execute({
@@ -43908,11 +44717,11 @@ async function claimServiceConnectionAction(args) {
     errorCode: typeof existing.rows[0]?.error_code === "string" ? existing.rows[0].error_code : null
   };
 }
-var import_node_crypto23, schemaReady2, schemaDb;
+var import_node_crypto24, schemaReady2, schemaDb;
 var init_service_connections = __esm({
   "src/api/service-connections.ts"() {
     "use strict";
-    import_node_crypto23 = require("crypto");
+    import_node_crypto24 = require("crypto");
     init_db();
     schemaReady2 = null;
     schemaDb = null;
@@ -44229,7 +45038,7 @@ async function listNangoToolsDirect(identity, connectionId) {
   });
   const readTools = tools.filter((tool) => classifyTool(tool) === "read").map((tool) => tool.name);
   const actionTools = tools.filter((tool) => classifyTool(tool) === "action").map((tool) => tool.name);
-  const revision = (0, import_node_crypto24.createHash)("sha256").update(JSON.stringify(tools.map((tool) => ({ name: tool.name, inputSchema: tool.inputSchema })))).digest("hex");
+  const revision = (0, import_node_crypto25.createHash)("sha256").update(JSON.stringify(tools.map((tool) => ({ name: tool.name, inputSchema: tool.inputSchema })))).digest("hex");
   await updateServiceConnectionTools(connection.id, readTools, actionTools, revision);
   const refreshed = await getOwnedServiceConnection(identity, connection.id);
   return { connection: refreshed ?? { ...connection, readTools, actionTools, toolRevision: revision }, tools };
@@ -44249,8 +45058,8 @@ async function callNangoToolDirect(args) {
     identity: args.identity,
     ratePolicyVersion: CONNECTED_USAGE_RATE_POLICY_VERSION
   });
-  const requestId = args.requestId?.trim() || (0, import_node_crypto24.randomUUID)();
-  const idempotencyKey = `main-nango:${(0, import_node_crypto24.createHash)("sha256").update(args.identity.toLowerCase()).update("\0").update(connection.id).update("\0").update(args.tool).update("\0").update(requestId).digest("hex")}`;
+  const requestId = args.requestId?.trim() || (0, import_node_crypto25.randomUUID)();
+  const idempotencyKey = `main-nango:${(0, import_node_crypto25.createHash)("sha256").update(args.identity.toLowerCase()).update("\0").update(connection.id).update("\0").update(args.tool).update("\0").update(requestId).digest("hex")}`;
   const startedAt = /* @__PURE__ */ new Date();
   const started = performance.now();
   let result;
@@ -44275,7 +45084,7 @@ async function callNangoToolDirect(args) {
       toolName: args.tool,
       operationKind: args.operationKind ?? args.classification,
       outcome: providerError ? "error" : "partial",
-      requestId: requestId.length <= 200 ? requestId : (0, import_node_crypto24.createHash)("sha256").update(requestId).digest("hex"),
+      requestId: requestId.length <= 200 ? requestId : (0, import_node_crypto25.createHash)("sha256").update(requestId).digest("hex"),
       startedAt: startedAt.toISOString(),
       completedAt: completedAt.toISOString()
     }
@@ -44312,15 +45121,15 @@ async function describeNangoToolDirect(identity, connectionId, toolName) {
     providerContractHash: MAIN_INTEGRATION_CONTRACT_HASH,
     protocolVersion: null,
     schemaSource: "live_tools_list",
-    schemaHash: (0, import_node_crypto24.createHash)("sha256").update(JSON.stringify(projected)).digest("hex"),
+    schemaHash: (0, import_node_crypto25.createHash)("sha256").update(JSON.stringify(projected)).digest("hex"),
     fetchedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
 }
-var import_node_crypto24, import_client6, import_streamableHttp, DEFAULT_NANGO_MCP_URL, NANGO_TIMEOUT_MS, NANGO_CONNECTION_PAGE_SIZE, NANGO_CONNECTION_MAX_PAGES, MAIN_INTEGRATION_CONTRACT_VERSION, MAIN_INTEGRATION_CONTRACT_HASH, MainNangoTransportError;
+var import_node_crypto25, import_client6, import_streamableHttp, DEFAULT_NANGO_MCP_URL, NANGO_TIMEOUT_MS, NANGO_CONNECTION_PAGE_SIZE, NANGO_CONNECTION_MAX_PAGES, MAIN_INTEGRATION_CONTRACT_VERSION, MAIN_INTEGRATION_CONTRACT_HASH, MainNangoTransportError;
 var init_main_nango_transport = __esm({
   "src/api/main-nango-transport.ts"() {
     "use strict";
-    import_node_crypto24 = require("crypto");
+    import_node_crypto25 = require("crypto");
     import_client6 = require("@modelcontextprotocol/sdk/client/index.js");
     import_streamableHttp = require("@modelcontextprotocol/sdk/client/streamableHttp.js");
     init_service_connections();
@@ -44942,7 +45751,7 @@ async function setScheduleConnectionActionsEnabled(identity, connectionId, enabl
   return data.connection.actionsEnabled === true;
 }
 async function callScheduleConnectionAction(identity, connectionId, input, tool, idempotencyKey) {
-  const requestId = `main-connected-action:${(0, import_node_crypto25.createHash)("sha256").update(identity).update("\0").update(idempotencyKey?.trim() || (0, import_node_crypto25.randomUUID)()).digest("hex")}`;
+  const requestId = `main-connected-action:${(0, import_node_crypto26.createHash)("sha256").update(identity).update("\0").update(idempotencyKey?.trim() || (0, import_node_crypto26.randomUUID)()).digest("hex")}`;
   if (mainOwnsIntegrations()) {
     const selectedTool = tool?.trim();
     if (!selectedTool) throw new NangoControlError("An action tool is required.", 400, "invalid_request", false);
@@ -45084,7 +45893,7 @@ function canonicalJson2(value) {
   return JSON.stringify(value);
 }
 function projectedToolSchemaHash(tool) {
-  return (0, import_node_crypto25.createHash)("sha256").update(canonicalJson2(tool)).digest("hex");
+  return (0, import_node_crypto26.createHash)("sha256").update(canonicalJson2(tool)).digest("hex");
 }
 async function describeNangoTool(identity, connectionId, tool, fresh) {
   if (mainOwnsIntegrations()) {
@@ -45345,11 +46154,11 @@ async function callMainOwnedExportPage(identity, input) {
     untrustedContent: true
   };
 }
-var import_node_crypto25, DEFAULT_NANGO_CONTROL_URL, DISABLED_NANGO_TOOLS, CONNECTION_SYNC_REQUIRED_TOOLS, CONNECTION_SYNC_OPTIONAL_TOOLS, NangoControlError, ScheduleConnectionValidationError, SAFE_CONTROL_ERROR_CODES, FIXED_CONTROL_ERROR_MESSAGES, CONTROL_ERROR_CODE_ALIASES;
+var import_node_crypto26, DEFAULT_NANGO_CONTROL_URL, DISABLED_NANGO_TOOLS, CONNECTION_SYNC_REQUIRED_TOOLS, CONNECTION_SYNC_OPTIONAL_TOOLS, NangoControlError, ScheduleConnectionValidationError, SAFE_CONTROL_ERROR_CODES, FIXED_CONTROL_ERROR_MESSAGES, CONTROL_ERROR_CODE_ALIASES;
 var init_nango_control = __esm({
   "src/api/nango-control.ts"() {
     "use strict";
-    import_node_crypto25 = require("crypto");
+    import_node_crypto26 = require("crypto");
     init_connected_data_export();
     init_main_nango_transport();
     init_service_connections();
@@ -45818,8 +46627,8 @@ function signingSecret() {
   return secret2;
 }
 function schedulerIntegrationSignature(args) {
-  const bodyHash = (0, import_node_crypto26.createHash)("sha256").update(args.body).digest("hex");
-  return (0, import_node_crypto26.createHmac)("sha256", args.secret).update(`${args.method.toUpperCase()}
+  const bodyHash = (0, import_node_crypto27.createHash)("sha256").update(args.body).digest("hex");
+  return (0, import_node_crypto27.createHmac)("sha256", args.secret).update(`${args.method.toUpperCase()}
 ${args.path}
 ${args.timestamp}
 ${args.nonce}
@@ -45866,17 +46675,17 @@ async function verifySchedulerIntegrationRequest(request, rawBody) {
   });
   const suppliedBytes = Buffer.from(signature, "hex");
   const expectedBytes = Buffer.from(expected, "hex");
-  if (suppliedBytes.length !== expectedBytes.length || !(0, import_node_crypto26.timingSafeEqual)(suppliedBytes, expectedBytes)) {
+  if (suppliedBytes.length !== expectedBytes.length || !(0, import_node_crypto27.timingSafeEqual)(suppliedBytes, expectedBytes)) {
     throw new SchedulerIntegrationAuthError("invalid_signature");
   }
   await claimNonce(nonce, timestampMs);
   return { requestId };
 }
-var import_node_crypto26, MAX_CLOCK_SKEW_MS, SchedulerIntegrationAuthError;
+var import_node_crypto27, MAX_CLOCK_SKEW_MS, SchedulerIntegrationAuthError;
 var init_scheduler_integration_auth = __esm({
   "src/api/scheduler-integration-auth.ts"() {
     "use strict";
-    import_node_crypto26 = require("crypto");
+    import_node_crypto27 = require("crypto");
     init_db();
     init_service_connections();
     MAX_CLOCK_SKEW_MS = 5 * 60 * 1e3;
@@ -46070,7 +46879,7 @@ function requireStripeSecret() {
 async function createSignupStripeCustomer(email) {
   const secret2 = requireStripeSecret();
   if (!secret2) return null;
-  const stripeClient = new import_stripe3.default(secret2, { apiVersion: STRIPE_API_VERSION2 });
+  const stripeClient = new import_stripe2.default(secret2, { apiVersion: STRIPE_API_VERSION });
   const customer = await stripeClient.customers.create({
     email,
     description: "MCP Scraper free account",
@@ -46340,7 +47149,7 @@ async function chargeTierChangeNow(stripeClient, subscriptionId, customerId) {
     return { ok: false, amountDue: 0, error: err instanceof Error ? err.message : "Unable to charge the plan change immediately." };
   }
 }
-var import_resend2, import_hono25, import_hono26, import_factory6, import_cookie2, import_stripe3, secureCookies2, isProduction2, sessionCookieOptions2, requireAllowedOrigin, auth2, adminAuth, sessionAuth, requireIntegrationsTier, requirePaidSchedulingTier, app, STRIPE_API_VERSION2, SYNC_HARVEST_TIMEOUT_OVERRIDE_MS;
+var import_resend2, import_hono25, import_hono26, import_factory6, import_cookie2, import_stripe2, secureCookies2, isProduction2, sessionCookieOptions2, requireAllowedOrigin, auth2, adminAuth, sessionAuth, requireIntegrationsTier, requirePaidSchedulingTier, app, STRIPE_API_VERSION, SYNC_HARVEST_TIMEOUT_OVERRIDE_MS;
 var init_server = __esm({
   "src/api/server.ts"() {
     "use strict";
@@ -46397,7 +47206,7 @@ var init_server = __esm({
     import_factory6 = require("hono/factory");
     import_cookie2 = require("hono/cookie");
     init_db();
-    import_stripe3 = __toESM(require("stripe"), 1);
+    import_stripe2 = __toESM(require("stripe"), 1);
     init_rates();
     init_server_schemas();
     init_page_diff();
@@ -46482,7 +47291,7 @@ var init_server = __esm({
       return next();
     });
     app = new import_hono25.Hono();
-    STRIPE_API_VERSION2 = "2026-02-25.clover";
+    STRIPE_API_VERSION = "2026-02-25.clover";
     app.use("*", async (c, next) => {
       await next();
       c.header("Cache-Control", "no-store");
@@ -46514,7 +47323,7 @@ var init_server = __esm({
         const user = await createUser(normalizedEmail, void 0, password, stripeCustomerId ?? void 0);
         if (stripeCustomerId) {
           try {
-            const stripeClient = new import_stripe3.default(process.env.STRIPE_SECRET_KEY, { apiVersion: STRIPE_API_VERSION2 });
+            const stripeClient = new import_stripe2.default(process.env.STRIPE_SECRET_KEY, { apiVersion: STRIPE_API_VERSION });
             await stripeClient.customers.update(stripeCustomerId, {
               metadata: {
                 app: "mcp-scraper",
@@ -46582,7 +47391,7 @@ var init_server = __esm({
       }
       const secret2 = requireStripeSecret();
       if (secret2 && user.stripe_customer_id) {
-        const stripeClient = new import_stripe3.default(secret2, { apiVersion: STRIPE_API_VERSION2 });
+        const stripeClient = new import_stripe2.default(secret2, { apiVersion: STRIPE_API_VERSION });
         const subs = await stripeClient.subscriptions.list({ customer: user.stripe_customer_id, status: "all", limit: 100 });
         for (const sub of subs.data) {
           if (sub.status === "active" || sub.status === "trialing" || sub.status === "past_due") {
@@ -46896,7 +47705,7 @@ var init_server = __esm({
         if (!priceId || !MEMORY_PLANS[priceId]) return c.json({ error: "Invalid priceId \u2014 must be a memory plan price." }, 400);
         const secret2 = process.env.STRIPE_SECRET_KEY?.trim();
         if (!secret2) return c.json({ error: "Stripe is not configured." }, 503);
-        const stripeClient = new import_stripe3.default(secret2, { apiVersion: STRIPE_API_VERSION2 });
+        const stripeClient = new import_stripe2.default(secret2, { apiVersion: STRIPE_API_VERSION });
         let customerId = user.stripe_customer_id;
         if (!customerId) {
           const customer = await stripeClient.customers.create({ email: user.email });
@@ -46931,7 +47740,7 @@ var init_server = __esm({
         if (!user.stripe_customer_id) return c.json({ error: "No billing account yet \u2014 subscribe first." }, 409);
         const secret2 = process.env.STRIPE_SECRET_KEY?.trim();
         if (!secret2) return c.json({ error: "Stripe is not configured." }, 503);
-        const stripeClient = new import_stripe3.default(secret2, { apiVersion: STRIPE_API_VERSION2 });
+        const stripeClient = new import_stripe2.default(secret2, { apiVersion: STRIPE_API_VERSION });
         const session = await stripeClient.billingPortal.sessions.create({
           customer: user.stripe_customer_id,
           return_url: `${appOrigin()}/memory`
@@ -47014,10 +47823,8 @@ var init_server = __esm({
       if (!providerConfigKey) return c.json({ ok: false, error: "providerConfigKey is required." }, 400);
       try {
         if (providerConfigKey !== "resend") {
-          await reconcileConnectedAccountBilling(
-            user,
-            billableNangoConnectionCount(await getNangoConnections(user.email, { summaryOnly: true }))
-          );
+          const existingCount = billableNangoConnectionCount(await getNangoConnections(user.email, { summaryOnly: true }));
+          await reconcileConnectedAccountBilling(user, existingCount + 1);
         }
         const session = providerConfigKey === "resend" ? await createResendConnectSession(user.email, resendOAuthCallbackUrl()) : await createNangoConnectSession(user.email, providerConfigKey);
         return c.json({ ok: true, ...session });
@@ -48248,7 +49055,7 @@ var init_server = __esm({
         if (user.concurrency_stripe_sub_id) return c.json({ error: "Already subscribed \u2014 cancel existing slot first to change." }, 409);
         const secret2 = process.env.STRIPE_SECRET_KEY?.trim();
         if (!secret2) return c.json({ error: "Stripe is not configured." }, 503);
-        const stripeClient = new import_stripe3.default(secret2, { apiVersion: STRIPE_API_VERSION2 });
+        const stripeClient = new import_stripe2.default(secret2, { apiVersion: STRIPE_API_VERSION });
         let customerId = user.stripe_customer_id;
         if (!customerId) {
           const customer = await stripeClient.customers.create({ email: user.email });
@@ -48278,10 +49085,10 @@ var init_server = __esm({
         const user = c.get("sessionUser");
         const raw = await c.req.json().catch(() => ({}));
         const tier = SUBSCRIPTION_TIER_BY_KEY[String(raw.tier ?? "")];
-        if (!tier) return c.json({ error: "Invalid tier. Choose starter, growth, or scale." }, 400);
+        if (!tier) return c.json({ error: "Invalid subscription tier." }, 400);
         const secret2 = process.env.STRIPE_SECRET_KEY?.trim();
         if (!secret2) return c.json({ error: "Stripe is not configured." }, 503);
-        const stripeClient = new import_stripe3.default(secret2, { apiVersion: STRIPE_API_VERSION2 });
+        const stripeClient = new import_stripe2.default(secret2, { apiVersion: STRIPE_API_VERSION });
         let customerId = user.stripe_customer_id;
         if (!customerId) {
           const customer = await stripeClient.customers.create({ email: user.email });
@@ -48333,7 +49140,7 @@ var init_server = __esm({
         if (!user.stripe_customer_id) return c.json({ error: "No billing account yet \u2014 subscribe first." }, 409);
         const secret2 = requireStripeSecret();
         if (!secret2) return c.json({ error: "Stripe is not configured." }, 503);
-        const stripeClient = new import_stripe3.default(secret2, { apiVersion: STRIPE_API_VERSION2 });
+        const stripeClient = new import_stripe2.default(secret2, { apiVersion: STRIPE_API_VERSION });
         const session = await stripeClient.billingPortal.sessions.create({
           customer: user.stripe_customer_id,
           return_url: `${appOrigin()}/billing`
@@ -48363,7 +49170,7 @@ var init_server = __esm({
         }
         const secret2 = process.env.STRIPE_SECRET_KEY?.trim();
         if (!secret2) return c.json({ error: "Stripe is not configured." }, 503);
-        const stripeClient = new import_stripe3.default(secret2, { apiVersion: STRIPE_API_VERSION2 });
+        const stripeClient = new import_stripe2.default(secret2, { apiVersion: STRIPE_API_VERSION });
         let customerId = user.stripe_customer_id;
         if (!customerId) {
           const customer = await stripeClient.customers.create({ email: user.email });
@@ -48407,7 +49214,7 @@ var init_server = __esm({
         if (!tier) return c.json({ error: "Invalid tier. Choose starter, growth, or scale.", tiers: Object.keys(SUBSCRIPTION_TIER_BY_KEY) }, 400);
         const secret2 = process.env.STRIPE_SECRET_KEY?.trim();
         if (!secret2) return c.json({ error: "Stripe is not configured." }, 503);
-        const stripeClient = new import_stripe3.default(secret2, { apiVersion: STRIPE_API_VERSION2 });
+        const stripeClient = new import_stripe2.default(secret2, { apiVersion: STRIPE_API_VERSION });
         let customerId = user.stripe_customer_id;
         if (!customerId) {
           const customer = await stripeClient.customers.create({ email: user.email });
@@ -48468,7 +49275,7 @@ var init_server = __esm({
       if (!user.concurrency_stripe_sub_id) return c.json({ error: "No active concurrency subscription." }, 404);
       const stripeSecret = process.env.STRIPE_SECRET_KEY?.trim();
       if (!stripeSecret) return c.json({ error: "Stripe is not configured." }, 503);
-      const stripeClient = new import_stripe3.default(stripeSecret, { apiVersion: STRIPE_API_VERSION2 });
+      const stripeClient = new import_stripe2.default(stripeSecret, { apiVersion: STRIPE_API_VERSION });
       await stripeClient.subscriptions.cancel(user.concurrency_stripe_sub_id);
       const nextSlots = Math.max(0, user.extra_concurrency_slots - 1);
       await setExtraConcurrencySlots(user.id, nextSlots);