mcp-scraper 0.32.2 → 0.33.0

package/dist/bin/api-server.cjs

@@ -15945,7 +15945,7 @@ var init_server_schemas = __esm({
       gl: import_zod15.z.string().optional(),
       hl: import_zod15.z.string().optional(),
       device: import_zod15.z.enum(["desktop", "mobile"]).optional(),
-      proxyMode: import_zod15.z.enum(["location", "configured", "none"]).optional(),
+      proxyMode: import_zod15.z.enum(["configured", "none"]).optional(),
       proxyZip: import_zod15.z.string().regex(/^\d{5}$/).optional(),
       debug: import_zod15.z.boolean().optional(),
       serpOnly: import_zod15.z.boolean().optional(),
@@ -19253,22 +19253,35 @@ var init_video_routes = __esm({
 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" });
-  if (input.location) params.set("uule", encodeUule(normalizeLocation(input.location)));
   return `https://www.google.com/search?${params.toString()}`;
 }
 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" });
-  if (input.location) params.set("uule", encodeUule(normalizeLocation(input.location)));
   return `https://www.google.com/search?${params.toString()}`;
 }
+function mapsIdentifiersFromUrl(url) {
+  const fid = url.match(/!1s(0x[0-9a-f]+):(0x[0-9a-f]+)/i) ?? url.match(/(0x[0-9a-f]+):(0x[0-9a-f]+)/i);
+  if (fid) {
+    try {
+      return { cid: `${fid[1]}:${fid[2]}`, cidDecimal: BigInt(fid[2]).toString() };
+    } catch {
+      return { cid: `${fid[1]}:${fid[2]}`, cidDecimal: null };
+    }
+  }
+  try {
+    const decimal = new URL(url).searchParams.get("cid");
+    return { cid: null, cidDecimal: decimal && /^\d+$/.test(decimal) ? decimal : null };
+  } catch {
+    return { cid: null, cidDecimal: null };
+  }
+}
 var LOCAL_RESULTS_PAGE_LIMIT, LOCAL_RESULTS_WAIT_MS, MAPS_REDIRECT_BASE, MapsSearchExtractor;
 var init_MapsSearchExtractor = __esm({
   "src/extractor/MapsSearchExtractor.ts"() {
     "use strict";
     init_errors();
     init_BrowserDriver();
-    init_uule();
     LOCAL_RESULTS_PAGE_LIMIT = 8;
     LOCAL_RESULTS_WAIT_MS = 1e3;
     MAPS_REDIRECT_BASE = "https://serp-redirector.vercel.app";
@@ -19347,13 +19360,15 @@ var init_MapsSearchExtractor = __esm({
           for (const card of cards) {
             if (results.length >= options.maxResults || seen.has(card.cardKey)) continue;
             seen.add(card.cardKey);
+            const cardIds = mapsIdentifiersFromUrl(card.directionsUrl ?? "");
+            const cardPlaceUrl = cardIds.cidDecimal ? `https://www.google.com/maps?cid=${cardIds.cidDecimal}` : card.placeUrl;
             const details = await this.openCardAndExtractDialog(page, card, options.includeServices);
             results.push({
               position: results.length + 1,
               name: card.name,
-              placeUrl: details?.placeUrl ?? card.placeUrl,
-              cid: details?.cid ?? card.cid,
-              cidDecimal: details?.cidDecimal ?? card.cidDecimal,
+              placeUrl: details?.placeUrl ?? cardPlaceUrl,
+              cid: details?.cid ?? cardIds.cid,
+              cidDecimal: details?.cidDecimal ?? cardIds.cidDecimal,
               rating: details?.rating ?? card.rating,
               reviewCount: details?.reviewCount ?? card.reviewCount,
               category: details?.category ?? card.category,
@@ -19410,8 +19425,10 @@ var init_MapsSearchExtractor = __esm({
             const phone = lines.map((line) => line.match(phonePattern)?.[0]).find((value) => Boolean(value)) ?? null;
             const hoursStatus = normalize4((lines.find((line) => /\b(?:open|closed|opens|closes)\b/i.test(line)) ?? "").split("\xB7")[0] ?? "");
             const address = lines.find((line) => addressPattern.test(line)) ?? null;
-            const websiteUrl = Array.from(card.querySelectorAll("a[href]")).map((anchor) => anchor.href).find((href) => /^https?:/i.test(href) && !/google\.|gstatic|googleusercontent/.test(href)) ?? null;
+            const anchorHrefs = Array.from(card.querySelectorAll("a[href]")).map((anchor) => anchor.href);
+            const websiteUrl = anchorHrefs.find((href) => /^https?:/i.test(href) && !/google\.|gstatic|googleusercontent/.test(href)) ?? null;
             if (!rating && !(phone && websiteUrl)) continue;
+            const fidHref = anchorHrefs.find((href) => /(0x[0-9a-f]+):(0x[0-9a-f]+)/i.test(href)) ?? null;
             const key = `${name.toLowerCase()}|${lines.join(" ").toLowerCase()}`;
             if (seen.has(key)) continue;
             seen.add(key);
@@ -19431,7 +19448,7 @@ var init_MapsSearchExtractor = __esm({
               phone,
               hoursStatus,
               websiteUrl,
-              directionsUrl: `https://www.google.com/maps/dir/?api=1&destination=${encodeURIComponent([name, address].filter(Boolean).join(", "))}`,
+              directionsUrl: fidHref ?? `https://www.google.com/maps/dir/?api=1&destination=${encodeURIComponent([name, address].filter(Boolean).join(", "))}`,
               metadata: lines.slice(0, 20)
             });
           }
@@ -20143,6 +20160,7 @@ async function cleanupDisposableProxy(kernelApiKey, proxyId, eventName) {
   }
 }
 async function runMapsSearchWithRotation(options) {
+  if (options.proxyMode === "location") options = { ...options, proxyMode: "none" };
   const attempts = [];
   const maxAttempts = mapsSearchMaxAttemptsForProxyMode(options.proxyMode) + 1;
   const started = Date.now();
@@ -24118,7 +24136,7 @@ var init_directory_workflow = __esm({
       saveCsv: import_zod26.z.boolean().default(true),
       gl: import_zod26.z.string().length(2).default("us"),
       hl: import_zod26.z.string().length(2).default("en"),
-      proxyMode: import_zod26.z.enum(["location", "configured", "none"]).default(DEFAULT_MAPS_PROXY_MODE),
+      proxyMode: import_zod26.z.enum(["configured", "none"]).default(DEFAULT_MAPS_PROXY_MODE),
       proxyZip: import_zod26.z.string().regex(/^\d{5}$/).optional(),
       debug: import_zod26.z.boolean().default(false),
       headless: import_zod26.z.boolean().default(true),
@@ -24774,7 +24792,7 @@ var init_directory = __esm({
       maxCities: import_zod28.z.number().int().min(1).max(100).default(25),
       maxResultsPerCity: import_zod28.z.number().int().min(1).max(50).default(20),
       concurrency: import_zod28.z.number().int().min(1).max(5).default(5),
-      proxyMode: import_zod28.z.enum(["location", "configured", "none"]).default(DEFAULT_MAPS_PROXY_MODE),
+      proxyMode: import_zod28.z.enum(["configured", "none"]).default(DEFAULT_MAPS_PROXY_MODE),
       saveCsv: import_zod28.z.boolean().default(true)
     });
     DIRECTORY_CSV_HEADERS = [
@@ -24929,7 +24947,7 @@ var init_get_leads = __esm({
       enrichWebsites: import_zod29.z.boolean().default(true).describe("Visit each business website (home + contact pages) to harvest email and social links. Uses the proxy/browser-backed extractor so blocked sites still resolve."),
       hydrateReviewCounts: import_zod29.z.boolean().default(true).describe("Deep-dive each profile to confirm the review count and booking URL that the Maps search list omits."),
       concurrency: import_zod29.z.number().int().min(1).max(4).default(3).describe("How many businesses to enrich in parallel. Keep low to respect per-account concurrency limits."),
-      proxyMode: import_zod29.z.enum(["location", "configured", "none"]).default(DEFAULT_MAPS_PROXY_MODE).describe("Proxy targeting for the Maps search. location targets the market; none is for local debugging.")
+      proxyMode: import_zod29.z.enum(["configured", "none"]).default(DEFAULT_MAPS_PROXY_MODE).describe("Proxy behavior for the Maps search. Leave unset for clean egress; country/region localization comes from gl/hl plus the city or region in the query.")
     });
     LEADS_CSV_HEADERS = [
       "position",
@@ -25148,7 +25166,7 @@ var init_local_competitive_audit = __esm({
       hydrateTop: import_zod30.z.number().int().min(0).max(10).default(5),
       maxReviews: import_zod30.z.number().int().min(0).max(500).default(50),
       concurrency: import_zod30.z.number().int().min(1).max(5).default(5),
-      proxyMode: import_zod30.z.enum(["location", "configured", "none"]).default(DEFAULT_MAPS_PROXY_MODE),
+      proxyMode: import_zod30.z.enum(["configured", "none"]).default(DEFAULT_MAPS_PROXY_MODE),
       returnPartial: import_zod30.z.boolean().default(true)
     });
     localCompetitiveAuditWorkflowDefinition = {
@@ -25601,7 +25619,7 @@ var init_comparison_briefs = __esm({
     init_directory();
     init_seo_workflow_utils();
     init_schemas3();
-    ProxyModeSchema = import_zod31.z.enum(["location", "configured", "none"]);
+    ProxyModeSchema = import_zod31.z.enum(["configured", "none"]);
     MapComparisonInputSchema = import_zod31.z.object({
       query: import_zod31.z.string().min(1),
       location: import_zod31.z.string().optional(),
@@ -29794,7 +29812,7 @@ var PACKAGE_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    PACKAGE_VERSION = "0.32.2";
+    PACKAGE_VERSION = "0.33.0";
   }
 });
 
@@ -30245,7 +30263,7 @@ var init_meta_ad_creative_media = __esm({
 });
 
 // src/mcp/mcp-tool-schemas.ts
-var import_zod35, HarvestPaaInputSchema, ExtractUrlInputSchema, DiffPageInputSchema, MapSiteUrlsInputSchema, ExtractSiteInputSchema, AuditSiteInputSchema, CheckSiteExportInputSchema, YoutubeHarvestInputSchema, YoutubeTranscribeInputSchema, FacebookPageIntelInputSchema, FacebookAdSearchInputSchema, RedditThreadInputSchema, VideoFrameAnalysisInputSchema, VideoFrameAnalysisStatusInputSchema, FacebookAdTranscribeInputSchema, FacebookVideoTranscribeInputSchema, GoogleAdsSearchInputSchema, GoogleAdsPageIntelInputSchema, GoogleAdsTranscribeInputSchema, InstagramProfileContentInputSchema, InstagramMediaDownloadInputSchema, MapsPlaceIntelInputSchema, TrustpilotReviewsInputSchema, G2ReviewsInputSchema, ReviewCardSchema, MapsSearchInputSchema, DirectoryWorkflowInputSchema, ArtifactPointerOutputSchema, RankTrackerModeSchema, RankTrackerBlueprintInputSchema, NullableString, MapsSearchAttemptOutput, MapsSearchOutputSchema, DirectoryMapsBusinessOutput, DirectoryWorkflowOutputSchema, RankTrackerToolPlanOutput, RankTrackerTableOutput, RankTrackerCronJobOutput, RankTrackerBlueprintOutputSchema, OrganicResultOutput, AiOverviewOutput, EntityIdsOutput, HarvestPaaOutputSchema, SearchSerpOutputSchema, ExtractUrlOutputSchema, DiffPageOutputSchema, ExtractSiteOutputSchema, AuditSiteOutputSchema, CheckSiteExportOutputSchema, MapsPlaceIntelOutputSchema, TrustpilotReviewsOutputSchema, G2ReviewsOutputSchema, CreditsInfoOutputSchema, MapSiteUrlsOutputSchema, YoutubeHarvestOutputSchema, FacebookAdSearchOutputSchema, VideoFrameAnalysisOutputSchema, VideoFrameAnalysisStatusOutputSchema, RedditThreadOutputSchema, FacebookPageIntelOutputSchema, GoogleAdsSearchOutputSchema, GoogleAdsPageIntelOutputSchema, TranscriptSignalOutput, FacebookVideoTranscribeOutputSchema, TranscriptChunkOutput, InstagramBrowserOutput, InstagramPaginationOutput, InstagramProfileContentOutputSchema, InstagramMediaTrackOutput, InstagramDownloadOutput, InstagramMediaDownloadOutputSchema, YoutubeTranscribeOutputSchema, FacebookAdTranscribeOutputSchema, GoogleAdsTranscribeOutputSchema, CaptureSerpSnapshotOutputSchema, CaptureSerpPageSnapshotsOutputSchema, CreditsInfoInputSchema, WorkflowIdSchema2, WorkflowListInputSchema, WorkflowSuggestInputSchema, WorkflowRunInputSchema, WorkflowStepInputSchema, WorkflowStatusInputSchema, WorkflowArtifactReadInputSchema, WorkflowRecipeOutput, WorkflowDefinitionOutput, WorkflowArtifactOutput, WorkflowListOutputSchema, WorkflowSuggestOutputSchema, WorkflowRunOutputSchema, WorkflowStepOutputSchema, WorkflowStatusOutputSchema, WorkflowArtifactReadOutputSchema, SearchSerpInputSchema, CaptureSerpSnapshotInputSchema, ScreenshotInputSchema, CaptureSerpPageSnapshotsInputSchema, ReportArtifactReadInputSchema, ReportArtifactReadOutputSchema, ListServiceConnectionsInputSchema, ListServiceConnectionsOutputSchema, TestServiceConnectionInputSchema, TestServiceConnectionOutputSchema, ReadServiceConnectionInputSchema, ReadServiceConnectionOutputSchema, MetaAdCreativeMediaInputSchema, MetaAdCreativeMediaOutputSchema, ImportServiceConnectionToMemoryInputSchema, ImportServiceConnectionToMemoryOutputSchema, DescribeServiceConnectionToolInputSchema, DescribeServiceConnectionToolOutputSchema, ConnectedDataContinuationSchema, ExportConnectedServiceDataInputSchema, ConnectedDataArtifactSchema, ExportConnectedServiceDataOutputSchema, SearchConsoleTableColumnSchema, SearchConsoleTableFilterSchema, ExportSearchConsoleTableDataInputSchema, ExportSearchConsoleTableDataOutputSchema, RenewConnectedDataExportDownloadInputSchema, RenewConnectedDataExportDownloadOutputSchema, CallServiceConnectionActionInputSchema, CallServiceConnectionActionOutputSchema, SetScheduledActionConnectionsInputSchema, SetScheduledActionConnectionsOutputSchema, SlackSendMessageInputSchema, SlackSendMessageOutputSchema, GmailSendMessageInputSchema, GmailSendMessageOutputSchema, GoogleCalendarCreateEventInputSchema, GoogleCalendarCreateEventOutputSchema, ZoomCreateMeetingInputSchema, ZoomCreateMeetingOutputSchema;
+var import_zod35, HarvestPaaInputSchema, ExtractUrlInputSchema, DiffPageInputSchema, MapSiteUrlsInputSchema, ExtractSiteInputSchema, AuditSiteInputSchema, CheckSiteExportInputSchema, YoutubeHarvestInputSchema, YoutubeTranscribeInputSchema, FacebookPageIntelInputSchema, FacebookAdSearchInputSchema, RedditThreadInputSchema, VideoFrameAnalysisInputSchema, VideoFrameAnalysisStatusInputSchema, FacebookAdTranscribeInputSchema, FacebookVideoTranscribeInputSchema, GoogleAdsSearchInputSchema, GoogleAdsPageIntelInputSchema, GoogleAdsTranscribeInputSchema, InstagramProfileContentInputSchema, InstagramMediaDownloadInputSchema, MapsPlaceIntelInputSchema, TrustpilotReviewsInputSchema, G2ReviewsInputSchema, ReviewCardSchema, MapsSearchInputSchema, DirectoryWorkflowInputSchema, ArtifactPointerOutputSchema, RankTrackerModeSchema, RankTrackerBlueprintInputSchema, NullableString, MapsSearchAttemptOutput, MapsSearchOutputSchema, DirectoryMapsBusinessOutput, DirectoryWorkflowOutputSchema, RankTrackerToolPlanOutput, RankTrackerTableOutput, RankTrackerCronJobOutput, RankTrackerBlueprintOutputSchema, OrganicResultOutput, AiOverviewOutput, EntityIdsOutput, HarvestPaaOutputSchema, SearchSerpOutputSchema, ExtractUrlOutputSchema, DiffPageOutputSchema, ExtractSiteOutputSchema, AuditSiteOutputSchema, CheckSiteExportOutputSchema, MapsPlaceIntelOutputSchema, TrustpilotReviewsOutputSchema, G2ReviewsOutputSchema, CreditsInfoOutputSchema, MapSiteUrlsOutputSchema, YoutubeHarvestOutputSchema, FacebookAdSearchOutputSchema, VideoFrameAnalysisOutputSchema, VideoFrameAnalysisStatusOutputSchema, RedditThreadOutputSchema, FacebookPageIntelOutputSchema, GoogleAdsSearchOutputSchema, GoogleAdsPageIntelOutputSchema, TranscriptSignalOutput, FacebookVideoTranscribeOutputSchema, TranscriptChunkOutput, InstagramBrowserOutput, InstagramPaginationOutput, InstagramProfileContentOutputSchema, InstagramMediaTrackOutput, InstagramDownloadOutput, InstagramMediaDownloadOutputSchema, YoutubeTranscribeOutputSchema, FacebookAdTranscribeOutputSchema, GoogleAdsTranscribeOutputSchema, CaptureSerpSnapshotOutputSchema, CaptureSerpPageSnapshotsOutputSchema, CreditsInfoInputSchema, WorkflowIdSchema2, WorkflowListInputSchema, WorkflowSuggestInputSchema, WorkflowRunInputSchema, WorkflowStepInputSchema, WorkflowStatusInputSchema, WorkflowArtifactReadInputSchema, WorkflowRecipeOutput, WorkflowDefinitionOutput, WorkflowArtifactOutput, WorkflowListOutputSchema, WorkflowSuggestOutputSchema, WorkflowRunOutputSchema, WorkflowStepOutputSchema, WorkflowStatusOutputSchema, WorkflowArtifactReadOutputSchema, SearchSerpInputSchema, CaptureSerpSnapshotInputSchema, ScreenshotInputSchema, CaptureSerpPageSnapshotsInputSchema, ReportArtifactReadInputSchema, ReportArtifactReadOutputSchema, ListServiceConnectionsInputSchema, ListServiceConnectionsOutputSchema, TestServiceConnectionInputSchema, TestServiceConnectionOutputSchema, ReadServiceConnectionInputSchema, ReadServiceConnectionOutputSchema, MetaAdCreativeMediaInputSchema, MetaAdCreativeMediaOutputSchema, ImportServiceConnectionToMemoryInputSchema, ImportServiceConnectionToMemoryOutputSchema, DescribeServiceConnectionToolInputSchema, DescribeServiceConnectionToolOutputSchema, ConnectedDataContinuationSchema, ExportConnectedServiceDataInputSchema, ConnectedDataArtifactSchema, ExportConnectedServiceDataOutputSchema, SearchConsoleTableColumnSchema, SearchConsoleTableFilterSchema, ExportSearchConsoleTableDataInputSchema, ExportSearchConsoleTableDataOutputSchema, RenewConnectedDataExportDownloadInputSchema, RenewConnectedDataExportDownloadOutputSchema, CallServiceConnectionActionInputSchema, CallServiceConnectionActionOutputSchema, SetScheduledActionConnectionsInputSchema, SetScheduledActionConnectionsOutputSchema, SlackSendMessageInputSchema, SlackSendMessageOutputSchema, GmailSendMessageInputSchema, GmailSendMessageOutputSchema, GmailSearchContactsInputSchema, GmailSearchContactsOutputSchema, GoogleCalendarCreateEventInputSchema, GoogleCalendarCreateEventOutputSchema, ZoomCreateMeetingInputSchema, ZoomCreateMeetingOutputSchema;
 var init_mcp_tool_schemas = __esm({
   "src/mcp/mcp-tool-schemas.ts"() {
     "use strict";
@@ -30258,7 +30276,7 @@ var init_mcp_tool_schemas = __esm({
       gl: import_zod35.z.string().length(2).default("us").describe("Google country code inferred from location or user language."),
       hl: import_zod35.z.string().default("en").describe("Google interface/content language inferred from the user request."),
       device: import_zod35.z.enum(["desktop", "mobile"]).default("desktop").describe("SERP device context. Use mobile only for mobile rankings."),
-      proxyMode: import_zod35.z.enum(["location", "configured", "none"]).default(DEFAULT_PROXY_MODE).describe('Leave unset (clean egress). Do NOT set "location" just because a city was named \u2014 that comes from city-in-query wording. "location" forces residential geo-IP for rank-tracking fidelity, is frequently CAPTCHA-blocked, and accepts failures.'),
+      proxyMode: import_zod35.z.enum(["configured", "none"]).default(DEFAULT_PROXY_MODE).describe("Leave unset for clean egress (the default). Country/region localization comes from gl/hl plus the city or region in the query \u2014 not from a proxy."),
       proxyZip: import_zod35.z.string().regex(/^\d{5}$/).optional().describe('US ZIP for residential geo-IP targeting. Only meaningful with proxyMode "location".'),
       debug: import_zod35.z.boolean().default(false).describe("Include sanitized diagnostics for debugging localization, CAPTCHA, or proxy behavior.")
     };
@@ -30427,7 +30445,7 @@ var init_mcp_tool_schemas = __esm({
       hl: import_zod35.z.string().length(2).default("en").describe("Language inferred from user request."),
       maxResults: import_zod35.z.number().int().min(1).max(50).default(10).describe("Number of candidates to return. Default 10, maximum 50."),
       includeServices: import_zod35.z.boolean().default(false).describe("Open each returned business profile to include its configured services and areas served when available. Adds a page visit per business; does not collect review cards."),
-      proxyMode: import_zod35.z.enum(["location", "configured", "none"]).default(DEFAULT_MAPS_PROXY_MODE).describe("Leave unset for the default route (stealth browser on the managed ISP proxy, retried on a fresh session when Google blocks). Localization comes from the city in the query plus gl/hl. location forces an explicit residential proxy \u2014 not recommended for Google."),
+      proxyMode: import_zod35.z.enum(["configured", "none"]).default(DEFAULT_MAPS_PROXY_MODE).describe("Leave unset for the default route (stealth browser on the managed ISP proxy, retried on a fresh session when Google blocks). Country/region localization comes from the city or region in the query plus gl/hl \u2014 not from a proxy."),
       proxyZip: import_zod35.z.string().regex(/^\d{5}$/).optional().describe("Optional US ZIP override, only used when proxyMode is location."),
       debug: import_zod35.z.boolean().default(false).describe("Include sanitized browser/proxy diagnostics.")
     };
@@ -30442,7 +30460,7 @@ var init_mcp_tool_schemas = __esm({
       includeZipGroups: import_zod35.z.boolean().default(true).describe("Attach ZIP groups from a configured US ZIPS CSV when available (MCP_SCRAPER_USZIPS_CSV_PATH or usZipsCsvPath)."),
       usZipsCsvPath: import_zod35.z.string().optional().describe("Local/test-only path to a US ZIPS CSV (state_abbr, zipcode, county, city columns). Deployed APIs should use MCP_SCRAPER_USZIPS_CSV_PATH instead. For ZIP enrichment, set MCP_SCRAPER_USZIPS_CSV_PATH on the server, or pass this in local/test mode."),
       saveCsv: import_zod35.z.boolean().default(true).describe("Save a directory-ready CSV of results to the MCP Scraper output directory and return its path."),
-      proxyMode: import_zod35.z.enum(["location", "configured", "none"]).default(DEFAULT_MAPS_PROXY_MODE).describe("Proxy behavior per city search. Leave unset for the default route (stealth browser on the managed ISP proxy, retried fresh on a Google block). location forces an explicit residential proxy \u2014 not recommended for Google."),
+      proxyMode: import_zod35.z.enum(["configured", "none"]).default(DEFAULT_MAPS_PROXY_MODE).describe("Proxy behavior per city search. Leave unset for the default route (stealth browser on the managed ISP proxy, retried fresh on a Google block). Country/region localization comes from the city or region in the query plus gl/hl \u2014 not from a proxy."),
       proxyZip: import_zod35.z.string().regex(/^\d{5}$/).optional().describe("Optional ZIP override for proxy targeting; normally omitted."),
       debug: import_zod35.z.boolean().default(false).describe("Include sanitized browser/proxy diagnostics.")
     };
@@ -31282,7 +31300,7 @@ var init_mcp_tool_schemas = __esm({
       gl: import_zod35.z.string().length(2).default("us").describe("Google country code inferred from location or user language."),
       hl: import_zod35.z.string().default("en").describe("Google interface/content language inferred from user request."),
       device: import_zod35.z.enum(["desktop", "mobile"]).default("desktop").describe("SERP device context. Use mobile only for mobile rankings."),
-      proxyMode: import_zod35.z.enum(["location", "configured", "none"]).default(DEFAULT_PROXY_MODE).describe('Leave unset (clean egress). Do NOT set "location" just because a city was named \u2014 that comes from city-in-query wording. "location" forces residential geo-IP for rank-tracking fidelity, is frequently CAPTCHA-blocked, and accepts failures.'),
+      proxyMode: import_zod35.z.enum(["configured", "none"]).default(DEFAULT_PROXY_MODE).describe("Leave unset for clean egress (the default). Country/region localization comes from gl/hl plus the city or region in the query \u2014 not from a proxy."),
       proxyZip: import_zod35.z.string().regex(/^\d{5}$/).optional().describe('US ZIP for residential geo-IP targeting. Only meaningful with proxyMode "location".'),
       debug: import_zod35.z.boolean().default(false).describe("Include sanitized diagnostics for debugging localization, CAPTCHA, or proxy behavior."),
       pages: import_zod35.z.number().int().min(1).max(2).default(1).describe("Number of result pages to fetch (1\u20132).")
@@ -31293,7 +31311,7 @@ var init_mcp_tool_schemas = __esm({
       gl: import_zod35.z.string().length(2).default("us").describe("Google country code inferred from the requested market."),
       hl: import_zod35.z.string().default("en").describe("Google interface/content language inferred from the user request."),
       device: import_zod35.z.enum(["desktop", "mobile"]).default("desktop").describe("SERP device context. Use mobile only for mobile rankings/evidence."),
-      proxyMode: import_zod35.z.enum(["location", "configured", "none"]).default(DEFAULT_PROXY_MODE).describe('Leave unset (clean egress). Do NOT set "location" just because a city was named \u2014 that comes from city-in-query wording. "location" forces residential geo-IP, is frequently CAPTCHA-blocked, and accepts failures.'),
+      proxyMode: import_zod35.z.enum(["configured", "none"]).default(DEFAULT_PROXY_MODE).describe("Leave unset for clean egress (the default). Country/region localization comes from gl/hl plus the city or region in the query \u2014 not from a proxy."),
       proxyZip: import_zod35.z.string().regex(/^\d{5}$/).optional().describe('US ZIP for residential geo-IP targeting. Only meaningful with proxyMode "location".'),
       pages: import_zod35.z.number().int().min(1).max(2).default(1).describe("Google result pages to capture. Use 2 only for deeper ranking evidence."),
       debug: import_zod35.z.boolean().default(false).describe("Include sanitized browser/proxy/location diagnostics."),
@@ -31652,6 +31670,37 @@ var init_mcp_tool_schemas = __esm({
       result: import_zod35.z.unknown().optional(),
       error: NullableString
     };
+    GmailSearchContactsInputSchema = {
+      connectionId: import_zod35.z.string().min(1).describe("A Gmail connectionId from list_service_connections. Read-only \u2014 does not require actionsEnabled."),
+      query: import_zod35.z.string().min(1).max(500).describe('Gmail search syntax, e.g. "from:brandnorth.com after:2026/03/22" or "brandnorth.com".'),
+      maxMessages: import_zod35.z.number().int().min(1).max(150).default(50).describe("Max messages to fetch and aggregate in this call. Paginate with pageToken for more; the response reports totalMatches and truncated so undercoverage is never silent."),
+      pageToken: import_zod35.z.string().optional().describe("Continuation token from a prior response to fetch the next page.")
+    };
+    GmailSearchContactsOutputSchema = {
+      ok: import_zod35.z.boolean(),
+      totalMatches: import_zod35.z.number().optional().describe("Gmail's estimated total matches for the query, independent of how many were fetched this call."),
+      messagesFetched: import_zod35.z.number().optional(),
+      truncated: import_zod35.z.boolean().optional().describe("True when totalMatches exceeds messagesFetched \u2014 more results exist, use nextPageToken."),
+      nextPageToken: NullableString,
+      messages: import_zod35.z.array(import_zod35.z.object({
+        id: import_zod35.z.string(),
+        date: NullableString,
+        from: NullableString,
+        to: NullableString,
+        subject: NullableString,
+        snippet: NullableString
+      })).optional(),
+      contacts: import_zod35.z.array(import_zod35.z.object({
+        email: import_zod35.z.string(),
+        name: NullableString,
+        domain: NullableString,
+        messageCount: import_zod35.z.number(),
+        firstSeen: NullableString,
+        lastSeen: NullableString,
+        sampleSubjects: import_zod35.z.array(import_zod35.z.string())
+      })).optional().describe("Messages deduped by sender email address, newest-to-oldest within this fetch only \u2014 not the full query result set when truncated."),
+      error: NullableString
+    };
     GoogleCalendarCreateEventInputSchema = {
       connectionId: import_zod35.z.string().min(1).describe("A Google Calendar connectionId from list_service_connections, with actionsEnabled true."),
       calendarId: import_zod35.z.string().min(1).default("primary").describe('Calendar to create the event in. Default "primary".'),
@@ -32398,6 +32447,13 @@ function registerPaaExtractorMcpTools(server, executor, options = {}) {
     outputSchema: recordOutputSchema("gmail_send_message", GmailSendMessageOutputSchema),
     annotations: { title: "Send Gmail Message", readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: true }
   }, async (input) => executor.gmailSendMessage(input));
+  server.registerTool("gmail_search_contacts", {
+    title: "Search Gmail Contacts",
+    description: 'Search Gmail with standard Gmail query syntax (e.g. "from:acme.com after:2026/03/22") and get back deduplicated sender contacts (email, name, domain, message count, first/last seen, sample subjects) instead of raw messages. Read-only \u2014 works on any connected Gmail connection from list_service_connections, no actionsEnabled required. Use this instead of looping list-messages/get-message yourself: those return bare message IDs and full raw MIME per message, which does not scale past a handful of messages. Reports totalMatches and truncated so incomplete coverage from a large result set is never silent \u2014 pass the returned nextPageToken to continue.',
+    inputSchema: GmailSearchContactsInputSchema,
+    outputSchema: recordOutputSchema("gmail_search_contacts", GmailSearchContactsOutputSchema),
+    annotations: { title: "Search Gmail Contacts", readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: true }
+  }, async (input) => executor.gmailSearchContacts(input));
   server.registerTool("google_calendar_create_event", {
     title: "Create Calendar Event",
     description: "Create a complete event on a connected, action-enabled Google Calendar connection. Always preserve the supplied purpose in description, include the Zoom join link when available, and include every explicitly named invitee in attendees. Do not create a bare meeting event. Requires a connectionId from list_service_connections with actionsEnabled true.",
@@ -32807,6 +32863,9 @@ var init_http_mcp_tool_executor = __esm({
       gmailSendMessage(input) {
         return this.call("/schedule-connections/actions/gmail/send-message", input);
       }
+      gmailSearchContacts(input) {
+        return this.call("/schedule-connections/actions/gmail/search-contacts", input);
+      }
       googleCalendarCreateEvent(input) {
         return this.call("/schedule-connections/actions/google-calendar/create-event", input);
       }
@@ -40068,6 +40127,225 @@ var init_browser_agent_console = __esm({
   }
 });
 
+// src/api/connected-account-billing.ts
+async function ensureConnectedAccountBillingSchema() {
+  await getDb().execute(`CREATE TABLE IF NOT EXISTS connected_account_billing (
+    user_id INTEGER PRIMARY KEY,
+    stripe_subscription_id TEXT,
+    stripe_subscription_item_id TEXT,
+    price_id TEXT,
+    quantity INTEGER NOT NULL DEFAULT 0,
+    status TEXT NOT NULL DEFAULT 'pending',
+    last_error_code TEXT,
+    synced_at TEXT,
+    updated_at TEXT NOT NULL DEFAULT (datetime('now'))
+  )`);
+}
+async function getConnectedAccountBillingState(userId) {
+  await ensureConnectedAccountBillingSchema();
+  const result = await getDb().execute({
+    sql: "SELECT * FROM connected_account_billing WHERE user_id = ? LIMIT 1",
+    args: [Number(userId)]
+  });
+  return result.rows[0] ? result.rows[0] : null;
+}
+async function setConnectedAccountBillingState(input) {
+  await ensureConnectedAccountBillingSchema();
+  await getDb().execute({
+    sql: `INSERT INTO connected_account_billing
+      (user_id, stripe_subscription_id, stripe_subscription_item_id, price_id, quantity, status, last_error_code, synced_at, updated_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?, CASE WHEN ? THEN datetime('now') ELSE NULL END, datetime('now'))
+      ON CONFLICT(user_id) DO UPDATE SET
+        stripe_subscription_id = excluded.stripe_subscription_id,
+        stripe_subscription_item_id = excluded.stripe_subscription_item_id,
+        price_id = excluded.price_id,
+        quantity = excluded.quantity,
+        status = excluded.status,
+        last_error_code = excluded.last_error_code,
+        synced_at = CASE WHEN ? THEN datetime('now') ELSE connected_account_billing.synced_at END,
+        updated_at = datetime('now')`,
+    args: [
+      Number(input.userId),
+      input.stripeSubscriptionId,
+      input.stripeSubscriptionItemId,
+      input.priceId,
+      input.quantity,
+      input.status,
+      input.lastErrorCode,
+      input.synced ? 1 : 0,
+      input.synced ? 1 : 0
+    ]
+  });
+  const state = await getConnectedAccountBillingState(input.userId);
+  if (!state) throw new Error("connected account billing state was not persisted");
+  return state;
+}
+function connectedAccountPriceId() {
+  const configured = process.env.CONNECTED_ACCOUNT_PRICE_ID?.trim();
+  if (configured) return configured;
+  return DEFAULT_CONNECTED_ACCOUNT_PRICE_ID || null;
+}
+function connectedAccountBillingView(actualQuantity, state) {
+  const quantity = Math.max(0, Math.round(actualQuantity));
+  return {
+    provider: "nango",
+    billingMode: "flat_recurring_usd_plus_credits",
+    priceId: connectedAccountPriceId(),
+    unitAmountUsd: CONNECTED_ACTIVE_CONNECTION_MONTHLY_USD,
+    interval: "month",
+    quantity,
+    projectedMonthlyUsd: quantity * CONNECTED_ACTIVE_CONNECTION_MONTHLY_USD,
+    status: state?.status ?? "pending",
+    lastErrorCode: state?.last_error_code ?? null,
+    syncedAt: state?.synced_at ?? null,
+    usage: CONNECTED_USAGE_RATE_POLICY.usage
+  };
+}
+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) {
+  if (error instanceof ConnectedAccountBillingError) return error.code;
+  return "stripe_connection_billing_failed";
+}
+async function persistFailure(user, actualQuantity, error, subscriptionItemId = null) {
+  await setConnectedAccountBillingState({
+    userId: user.id,
+    stripeSubscriptionId: user.subscription_id,
+    stripeSubscriptionItemId: subscriptionItemId,
+    priceId: connectedAccountPriceId(),
+    quantity: actualQuantity,
+    status: error instanceof ConnectedAccountBillingError && error.code !== "stripe_connection_billing_failed" ? "blocked" : "error",
+    lastErrorCode: safeStripeErrorCode(error),
+    synced: false
+  });
+}
+async function reconcileConnectedAccountBilling(user, actualQuantity, stripeClient) {
+  if (!Number.isSafeInteger(actualQuantity) || actualQuantity < 0) {
+    throw new Error("actualQuantity must be a non-negative safe integer");
+  }
+  const priceId = connectedAccountPriceId();
+  if (!priceId) {
+    const error = new ConnectedAccountBillingError(
+      "Connected-account billing is not configured.",
+      "connected_account_price_not_configured",
+      503
+    );
+    await persistFailure(user, actualQuantity, error);
+    throw error;
+  }
+  if (!user.subscription_id) {
+    if (actualQuantity === 0) {
+      const state = await setConnectedAccountBillingState({
+        userId: user.id,
+        stripeSubscriptionId: null,
+        stripeSubscriptionItemId: null,
+        priceId,
+        quantity: 0,
+        status: "synced",
+        lastErrorCode: null,
+        synced: true
+      });
+      return connectedAccountBillingView(0, state);
+    }
+    const error = new ConnectedAccountBillingError(
+      "An active paid plan is required before connected accounts can be billed.",
+      "paid_plan_required",
+      403
+    );
+    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;
+  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
+      );
+    }
+    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);
+    }
+    const state = await setConnectedAccountBillingState({
+      userId: user.id,
+      stripeSubscriptionId: subscription.id,
+      stripeSubscriptionItemId: resultingItem?.id ?? null,
+      priceId,
+      quantity: actualQuantity,
+      status: "synced",
+      lastErrorCode: null,
+      synced: true
+    });
+    return connectedAccountBillingView(actualQuantity, state);
+  } catch (error) {
+    await persistFailure(user, actualQuantity, error, currentItem?.id ?? null);
+    if (error instanceof ConnectedAccountBillingError) throw error;
+    throw new ConnectedAccountBillingError(
+      "Unable to update connected-account billing in Stripe.",
+      "stripe_connection_billing_failed",
+      503
+    );
+  }
+}
+async function currentConnectedAccountBillingView(userId, actualQuantity) {
+  return connectedAccountBillingView(actualQuantity, await getConnectedAccountBillingState(userId));
+}
+var import_stripe, DEFAULT_CONNECTED_ACCOUNT_PRICE_ID, STRIPE_API_VERSION, 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) {
+        super(message);
+        this.code = code;
+        this.status = status;
+        this.name = "ConnectedAccountBillingError";
+      }
+      code;
+      status;
+    };
+  }
+});
+
 // src/api/stripe-routes.ts
 function linePriceId(line) {
   const l = line;
@@ -40081,16 +40359,17 @@ async function resolveUser2(customerId, emailFallback) {
   if (user) await setStripeCustomerId(user.id, customerId);
   return user;
 }
-var import_stripe, import_hono19, stripe, stripeApp;
+var import_stripe2, import_hono19, stripe, stripeApp;
 var init_stripe_routes = __esm({
   "src/api/stripe-routes.ts"() {
     "use strict";
-    import_stripe = __toESM(require("stripe"), 1);
+    import_stripe2 = __toESM(require("stripe"), 1);
     import_hono19 = require("hono");
     init_db();
     init_rates();
     init_memory();
-    stripe = new import_stripe.default(process.env.STRIPE_SECRET_KEY, { apiVersion: "2026-02-25.clover" });
+    init_connected_account_billing();
+    stripe = new import_stripe2.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");
@@ -40107,15 +40386,23 @@ var init_stripe_routes = __esm({
         const invoice = event.data.object;
         const memLineId = invoice.lines.data.map(linePriceId).find((id) => id && id in MEMORY_PLANS);
         if (memLineId) return c.json({ received: true });
-        const lineTierId = invoice.lines.data.map(linePriceId).find((id) => id && id in SUBSCRIPTION_TIERS);
-        if (lineTierId) {
-          const tier = SUBSCRIPTION_TIERS[lineTierId];
-          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 setSubscriptionTier(user.id, tier.tier, tier.concurrency, invoice.subscription ?? user.subscription_id);
-            const credentials = await syncScheduledActionCredentials(user);
-            if (!credentials.ok) console.warn("[stripe] scheduled-action credential sync failed:", credentials.error ?? "unknown error");
+        const invoiceHasTierLine = invoice.lines.data.some((l) => {
+          const id = linePriceId(l);
+          return id && id in SUBSCRIPTION_TIERS;
+        });
+        if (invoiceHasTierLine) {
+          const subId = invoice.subscription;
+          const liveBasePlanPriceId = subId ? findBasePlanItem(await stripe.subscriptions.retrieve(subId))?.price?.id : void 0;
+          const tierPriceId = liveBasePlanPriceId ?? invoice.lines.data.map(linePriceId).find((id) => id && id in SUBSCRIPTION_TIERS);
+          const tier = tierPriceId ? SUBSCRIPTION_TIERS[tierPriceId] : void 0;
+          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 setSubscriptionTier(user.id, tier.tier, tier.concurrency, subId ?? user.subscription_id);
+              const credentials = await syncScheduledActionCredentials(user);
+              if (!credentials.ok) console.warn("[stripe] scheduled-action credential sync failed:", credentials.error ?? "unknown error");
+            }
           }
         }
       }
@@ -43484,8 +43771,8 @@ async function reconcileDiscoveredNangoConnections(identity, discovered) {
       sql: `
         INSERT INTO service_connections (
           id, user_id, provider_config_key, provider, transport, upstream_connection_id,
-          label, lifecycle_status, reconnect_required, legacy_owner_identity, created_at, updated_at
-        ) VALUES (?, ?, ?, ?, 'nango', ?, ?, ?, ?, ?, COALESCE(?, datetime('now')), COALESCE(?, datetime('now')))
+          label, lifecycle_status, reconnect_required, actions_enabled, legacy_owner_identity, created_at, updated_at
+        ) VALUES (?, ?, ?, ?, 'nango', ?, ?, ?, ?, 1, ?, COALESCE(?, datetime('now')), COALESCE(?, datetime('now')))
         ON CONFLICT(user_id, provider_config_key, upstream_connection_id) DO UPDATE SET
           provider = excluded.provider,
           label = COALESCE(excluded.label, service_connections.label),
@@ -45601,225 +45888,6 @@ var init_scheduler_integration_auth = __esm({
   }
 });
 
-// src/api/connected-account-billing.ts
-async function ensureConnectedAccountBillingSchema() {
-  await getDb().execute(`CREATE TABLE IF NOT EXISTS connected_account_billing (
-    user_id INTEGER PRIMARY KEY,
-    stripe_subscription_id TEXT,
-    stripe_subscription_item_id TEXT,
-    price_id TEXT,
-    quantity INTEGER NOT NULL DEFAULT 0,
-    status TEXT NOT NULL DEFAULT 'pending',
-    last_error_code TEXT,
-    synced_at TEXT,
-    updated_at TEXT NOT NULL DEFAULT (datetime('now'))
-  )`);
-}
-async function getConnectedAccountBillingState(userId) {
-  await ensureConnectedAccountBillingSchema();
-  const result = await getDb().execute({
-    sql: "SELECT * FROM connected_account_billing WHERE user_id = ? LIMIT 1",
-    args: [Number(userId)]
-  });
-  return result.rows[0] ? result.rows[0] : null;
-}
-async function setConnectedAccountBillingState(input) {
-  await ensureConnectedAccountBillingSchema();
-  await getDb().execute({
-    sql: `INSERT INTO connected_account_billing
-      (user_id, stripe_subscription_id, stripe_subscription_item_id, price_id, quantity, status, last_error_code, synced_at, updated_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, CASE WHEN ? THEN datetime('now') ELSE NULL END, datetime('now'))
-      ON CONFLICT(user_id) DO UPDATE SET
-        stripe_subscription_id = excluded.stripe_subscription_id,
-        stripe_subscription_item_id = excluded.stripe_subscription_item_id,
-        price_id = excluded.price_id,
-        quantity = excluded.quantity,
-        status = excluded.status,
-        last_error_code = excluded.last_error_code,
-        synced_at = CASE WHEN ? THEN datetime('now') ELSE connected_account_billing.synced_at END,
-        updated_at = datetime('now')`,
-    args: [
-      Number(input.userId),
-      input.stripeSubscriptionId,
-      input.stripeSubscriptionItemId,
-      input.priceId,
-      input.quantity,
-      input.status,
-      input.lastErrorCode,
-      input.synced ? 1 : 0,
-      input.synced ? 1 : 0
-    ]
-  });
-  const state = await getConnectedAccountBillingState(input.userId);
-  if (!state) throw new Error("connected account billing state was not persisted");
-  return state;
-}
-function connectedAccountPriceId() {
-  const configured = process.env.CONNECTED_ACCOUNT_PRICE_ID?.trim();
-  if (configured) return configured;
-  return DEFAULT_CONNECTED_ACCOUNT_PRICE_ID || null;
-}
-function connectedAccountBillingView(actualQuantity, state) {
-  const quantity = Math.max(0, Math.round(actualQuantity));
-  return {
-    provider: "nango",
-    billingMode: "flat_recurring_usd_plus_credits",
-    priceId: connectedAccountPriceId(),
-    unitAmountUsd: CONNECTED_ACTIVE_CONNECTION_MONTHLY_USD,
-    interval: "month",
-    quantity,
-    projectedMonthlyUsd: quantity * CONNECTED_ACTIVE_CONNECTION_MONTHLY_USD,
-    status: state?.status ?? "pending",
-    lastErrorCode: state?.last_error_code ?? null,
-    syncedAt: state?.synced_at ?? null,
-    usage: CONNECTED_USAGE_RATE_POLICY.usage
-  };
-}
-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) {
-  if (error instanceof ConnectedAccountBillingError) return error.code;
-  return "stripe_connection_billing_failed";
-}
-async function persistFailure(user, actualQuantity, error, subscriptionItemId = null) {
-  await setConnectedAccountBillingState({
-    userId: user.id,
-    stripeSubscriptionId: user.subscription_id,
-    stripeSubscriptionItemId: subscriptionItemId,
-    priceId: connectedAccountPriceId(),
-    quantity: actualQuantity,
-    status: error instanceof ConnectedAccountBillingError && error.code !== "stripe_connection_billing_failed" ? "blocked" : "error",
-    lastErrorCode: safeStripeErrorCode(error),
-    synced: false
-  });
-}
-async function reconcileConnectedAccountBilling(user, actualQuantity, stripeClient) {
-  if (!Number.isSafeInteger(actualQuantity) || actualQuantity < 0) {
-    throw new Error("actualQuantity must be a non-negative safe integer");
-  }
-  const priceId = connectedAccountPriceId();
-  if (!priceId) {
-    const error = new ConnectedAccountBillingError(
-      "Connected-account billing is not configured.",
-      "connected_account_price_not_configured",
-      503
-    );
-    await persistFailure(user, actualQuantity, error);
-    throw error;
-  }
-  if (!user.subscription_id) {
-    if (actualQuantity === 0) {
-      const state = await setConnectedAccountBillingState({
-        userId: user.id,
-        stripeSubscriptionId: null,
-        stripeSubscriptionItemId: null,
-        priceId,
-        quantity: 0,
-        status: "synced",
-        lastErrorCode: null,
-        synced: true
-      });
-      return connectedAccountBillingView(0, state);
-    }
-    const error = new ConnectedAccountBillingError(
-      "An active paid plan is required before connected accounts can be billed.",
-      "paid_plan_required",
-      403
-    );
-    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_stripe2.default(secret2, { apiVersion: STRIPE_API_VERSION });
-  })();
-  let currentItem;
-  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
-      );
-    }
-    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);
-    }
-    const state = await setConnectedAccountBillingState({
-      userId: user.id,
-      stripeSubscriptionId: subscription.id,
-      stripeSubscriptionItemId: resultingItem?.id ?? null,
-      priceId,
-      quantity: actualQuantity,
-      status: "synced",
-      lastErrorCode: null,
-      synced: true
-    });
-    return connectedAccountBillingView(actualQuantity, state);
-  } catch (error) {
-    await persistFailure(user, actualQuantity, error, currentItem?.id ?? null);
-    if (error instanceof ConnectedAccountBillingError) throw error;
-    throw new ConnectedAccountBillingError(
-      "Unable to update connected-account billing in Stripe.",
-      "stripe_connection_billing_failed",
-      503
-    );
-  }
-}
-async function currentConnectedAccountBillingView(userId, actualQuantity) {
-  return connectedAccountBillingView(actualQuantity, await getConnectedAccountBillingState(userId));
-}
-var import_stripe2, DEFAULT_CONNECTED_ACCOUNT_PRICE_ID, STRIPE_API_VERSION, ConnectedAccountBillingError;
-var init_connected_account_billing = __esm({
-  "src/api/connected-account-billing.ts"() {
-    "use strict";
-    import_stripe2 = __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) {
-        super(message);
-        this.code = code;
-        this.status = status;
-        this.name = "ConnectedAccountBillingError";
-      }
-      code;
-      status;
-    };
-  }
-});
-
 // src/api/webhook.ts
 async function deliverWebhook(url, payload, retries = 3) {
   for (let attempt = 1; attempt <= retries; attempt++) {
@@ -46193,6 +46261,22 @@ function schedulerIntegrationAuthError(c, error) {
   }
   return scheduleConnectionError(c, error, "The scheduler integration request failed.");
 }
+function toolResultText(result) {
+  if (!result || typeof result !== "object") return null;
+  const content = result.content;
+  if (!Array.isArray(content)) return null;
+  const textItem = content.find((item) => item && typeof item === "object" && item.type === "text");
+  const text2 = textItem?.text;
+  return typeof text2 === "string" ? text2 : null;
+}
+function parseEmailAddress(headerValue) {
+  const value = headerValue?.trim();
+  if (!value) return null;
+  const angled = value.match(/^"?([^"<]*?)"?\s*<([^>]+)>$/);
+  if (angled) return { email: angled[2].trim().toLowerCase(), name: angled[1].trim() || null };
+  const bare = value.match(/^([^\s<>]+@[^\s<>]+)$/);
+  return bare ? { email: bare[1].trim().toLowerCase(), name: null } : null;
+}
 async function forwardIntegrationAlias(c, targetPath) {
   const url = new URL(c.req.url);
   url.pathname = targetPath;
@@ -46237,6 +46321,22 @@ async function checkHarvestLimits(user, reuseLockId) {
   }
   return null;
 }
+async function chargeTierChangeNow(stripeClient, subscriptionId, customerId) {
+  try {
+    const draft = await stripeClient.invoices.create({
+      customer: customerId,
+      subscription: subscriptionId,
+      auto_advance: true,
+      collection_method: "charge_automatically"
+    });
+    const finalized = await stripeClient.invoices.finalizeInvoice(draft.id);
+    if (finalized.amount_due <= 0 || finalized.status === "paid") return { ok: true, amountDue: finalized.amount_due };
+    const paid = await stripeClient.invoices.pay(finalized.id);
+    return { ok: paid.status === "paid", amountDue: paid.amount_due };
+  } catch (err) {
+    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 init_server = __esm({
   "src/api/server.ts"() {
@@ -47066,7 +47166,7 @@ var init_server = __esm({
           user.email,
           connectionId,
           { channel: body.channel, text: body.text },
-          void 0,
+          "send-message",
           connectedActionIdempotencyKey(c)
         );
         return c.json({ ok: true, result });
@@ -47086,7 +47186,7 @@ var init_server = __esm({
           user.email,
           connectionId,
           { to: body.to, subject: body.subject, body: body.body },
-          void 0,
+          "send-message",
           connectedActionIdempotencyKey(c)
         );
         return c.json({ ok: true, result });
@@ -47094,6 +47194,60 @@ var init_server = __esm({
         return scheduleConnectionError(c, err, "Unable to send the email.");
       }
     });
+    app.post("/schedule-connections/actions/gmail/search-contacts", auth2, requireIntegrationsTier, async (c) => {
+      const user = c.get("user");
+      const body = await c.req.json().catch(() => ({}));
+      const connectionId = providerConfigKeyFrom(body.connectionId);
+      const query = typeof body.query === "string" ? body.query.trim() : "";
+      const maxMessages = Math.min(150, Math.max(1, Number.isFinite(body.maxMessages) ? Number(body.maxMessages) : 50));
+      const pageToken = typeof body.pageToken === "string" ? body.pageToken : void 0;
+      if (!connectionId || !query) return c.json({ ok: false, error: "connectionId and query are required." }, 400);
+      try {
+        const listRaw = await callScheduleConnectionRead(user.email, connectionId, "list-messages", { q: query, maxResults: maxMessages, pageToken });
+        const listText = toolResultText(listRaw);
+        const list = listText ? JSON.parse(listText) : {};
+        const ids = (list.messages ?? []).map((m) => m.id);
+        const messages = [];
+        const contacts = /* @__PURE__ */ new Map();
+        for (const id of ids) {
+          const msgRaw = await callScheduleConnectionRead(user.email, connectionId, "get-message", { id, format: "metadata" });
+          const msgText = toolResultText(msgRaw);
+          if (!msgText) continue;
+          const msg = JSON.parse(msgText);
+          const headers = new Map((msg.payload?.headers ?? []).map((h) => [h.name.toLowerCase(), h.value]));
+          const date = headers.get("date") ?? null;
+          const fromRaw = headers.get("from");
+          const from = parseEmailAddress(fromRaw);
+          const subject = headers.get("subject") ?? null;
+          messages.push({ id, date, from: fromRaw ?? null, to: headers.get("to") ?? null, subject, snippet: msg.snippet ?? null });
+          if (from) {
+            const domain = from.email.split("@")[1] ?? null;
+            const existing = contacts.get(from.email);
+            if (existing) {
+              existing.messageCount += 1;
+              existing.name = existing.name ?? from.name;
+              if (subject && existing.sampleSubjects.length < 5 && !existing.sampleSubjects.includes(subject)) existing.sampleSubjects.push(subject);
+              if (date && (!existing.lastSeen || date > existing.lastSeen)) existing.lastSeen = date;
+              if (date && (!existing.firstSeen || date < existing.firstSeen)) existing.firstSeen = date;
+            } else {
+              contacts.set(from.email, { email: from.email, name: from.name, domain, messageCount: 1, firstSeen: date, lastSeen: date, sampleSubjects: subject ? [subject] : [] });
+            }
+          }
+        }
+        const totalMatches = list.resultSizeEstimate;
+        return c.json({
+          ok: true,
+          totalMatches,
+          messagesFetched: messages.length,
+          truncated: typeof totalMatches === "number" ? totalMatches > messages.length : Boolean(list.nextPageToken),
+          nextPageToken: list.nextPageToken ?? null,
+          messages,
+          contacts: Array.from(contacts.values())
+        });
+      } catch (err) {
+        return scheduleConnectionError(c, err, "Unable to search Gmail contacts.");
+      }
+    });
     app.post("/schedule-connections/actions/google-calendar/create-event", auth2, requireIntegrationsTier, async (c) => {
       const user = c.get("user");
       const body = await c.req.json().catch(() => ({}));
@@ -47112,7 +47266,7 @@ var init_server = __esm({
           start: { dateTime: body.startDateTime, timeZone },
           end: { dateTime: body.endDateTime, timeZone },
           attendees
-        }, void 0, connectedActionIdempotencyKey(c));
+        }, "create-event", connectedActionIdempotencyKey(c));
         return c.json({ ok: true, result });
       } catch (err) {
         return scheduleConnectionError(c, err, "Unable to create the calendar event.");
@@ -47132,7 +47286,7 @@ var init_server = __esm({
           durationMinutes: typeof body.durationMinutes === "number" ? body.durationMinutes : 30,
           timezone: typeof body.timezone === "string" ? body.timezone : void 0,
           agenda: body.agenda
-        }, void 0, connectedActionIdempotencyKey(c));
+        }, "create-meeting", connectedActionIdempotencyKey(c));
         return c.json({ ok: true, result });
       } catch (err) {
         return scheduleConnectionError(c, err, "Unable to create the Zoom meeting.");
@@ -48139,7 +48293,16 @@ var init_server = __esm({
               items: [{ id: itemId, price: tier.price_id }],
               proration_behavior: "create_prorations"
             });
-            return c.json({ updated: true, tier: tier.tier });
+            const billed = await chargeTierChangeNow(stripeClient, user.subscription_id, customerId);
+            if (!billed.ok) {
+              return c.json({
+                updated: true,
+                tier: tier.tier,
+                billed: false,
+                error: billed.error ?? "Plan changed, but the prorated charge could not be collected. Update your payment method and it will retry automatically."
+              });
+            }
+            return c.json({ updated: true, tier: tier.tier, billed: true });
           }
         }
         const session = await stripeClient.checkout.sessions.create({
@@ -48256,7 +48419,16 @@ var init_server = __esm({
               items: [{ id: itemId, price: tier.price_id }],
               proration_behavior: "create_prorations"
             });
-            return c.json({ updated: true, tier: tier.tier, message: `Switched to ${tier.label} (prorated). Credits and concurrency update on the next invoice.` });
+            const billed = await chargeTierChangeNow(stripeClient, user.subscription_id, customerId);
+            if (!billed.ok) {
+              return c.json({
+                updated: true,
+                tier: tier.tier,
+                billed: false,
+                message: `Switched to ${tier.label} (prorated), but the prorated charge could not be collected: ${billed.error ?? "unknown error"}. Update your payment method and it will retry automatically.`
+              });
+            }
+            return c.json({ updated: true, tier: tier.tier, billed: true, message: `Switched to ${tier.label} and charged the prorated difference immediately \u2014 credits and concurrency are live now.` });
           }
         }
         const session = await stripeClient.checkout.sessions.create({