search-console-mcp 1.13.2 → 1.13.4

package/README.md

@@ -3,7 +3,7 @@
 
 A Model Context Protocol (MCP) server that transforms how you interact with **Google Search Console**, **Bing Webmaster Tools**, and **Google Analytics 4**. Stop exporting CSVs and start asking questions.
 
-[📚 View Documentation](https://searchconsolemcp.mintlify.app/)
+[📚 View Documentation](https://searchconsolemcp.saurabh.app/)
 
 ---
 

package/dist/bing/tools/advanced-analytics.js

@@ -1,4 +1,5 @@
 import { detectAnomalies, getRankAndTrafficStats } from './analytics.js';
+import { parseMicrosoftDate, startOfDay, endOfDay } from '../../common/utils/dates.js';
 /**
  * Historical Bing Algorithm Update dates (recent notable ones)
  */
@@ -35,8 +36,8 @@ export async function analyzeDropAttribution(siteUrl, options = {}) {
     const impacts = { mobile: 0, desktop: 0, tablet: 0 };
     // Check for algorithm updates within 2 days of the drop
     const possibleUpdate = ALGORITHM_UPDATES.find(u => {
-        const uDate = new Date(u.date);
-        const dDate = new Date(dropDate);
+        const uDate = startOfDay(new Date(u.date));
+        const dDate = startOfDay(parseMicrosoftDate(dropDate));
         const diff = Math.abs(dDate.getTime() - uDate.getTime()) / (1000 * 60 * 60 * 24);
         return diff <= 2;
     });
@@ -66,12 +67,13 @@ export async function getTimeSeriesInsights(siteUrl, options = {}) {
     const dimensions = ['date'];
     const rawRows = await getRankAndTrafficStats(siteUrl);
     // Sort rows by date ascending
-    const rows = rawRows.sort((a, b) => new Date(a.Date).getTime() - new Date(b.Date).getTime());
+    const rows = rawRows.sort((a, b) => parseMicrosoftDate(a.Date).getTime() - parseMicrosoftDate(b.Date).getTime());
     // Filter by date range if provided
     let startIndex = 0;
     let endIndex = rows.length;
     if (options.startDate) {
-        startIndex = rows.findIndex(r => r.Date >= options.startDate);
+        const s = startOfDay(new Date(options.startDate)).getTime();
+        startIndex = rows.findIndex(r => parseMicrosoftDate(r.Date).getTime() >= s);
         // If no date is >= startDate, then all dates are < startDate (since sorted ascending)
         if (startIndex === -1)
             startIndex = rows.length;
@@ -80,8 +82,9 @@ export async function getTimeSeriesInsights(siteUrl, options = {}) {
         startIndex = Math.max(0, rows.length - options.days);
     }
     if (options.endDate) {
+        const e = endOfDay(new Date(options.endDate)).getTime();
         // find index where date > endDate
-        endIndex = rows.findIndex(r => r.Date > options.endDate);
+        endIndex = rows.findIndex(r => parseMicrosoftDate(r.Date).getTime() > e);
         if (endIndex === -1)
             endIndex = rows.length;
     }
@@ -113,7 +116,7 @@ export async function getTimeSeriesInsights(siteUrl, options = {}) {
     if (granularity === 'weekly') {
         const weeklyData = {};
         data.forEach(d => {
-            const date = new Date(d.date);
+            const date = parseMicrosoftDate(d.date);
             const day = date.getUTCDay();
             const diff = date.getUTCDate() - day + (day === 0 ? -6 : 1); // Adjust to Monday
             const monday = new Date(date);
@@ -185,7 +188,7 @@ export async function getTimeSeriesInsights(siteUrl, options = {}) {
         const firstMetric = metrics[0];
         const dowStats = [[], [], [], [], [], [], []];
         data.forEach(d => {
-            const day = new Date(d.date).getDay();
+            const day = parseMicrosoftDate(d.date).getDay();
             dowStats[day].push(d.metrics[firstMetric]);
         });
         const dowAverages = dowStats.map(vals => vals.length > 0 ? vals.reduce((a, b) => a + b, 0) / vals.length : 0);
@@ -195,7 +198,7 @@ export async function getTimeSeriesInsights(siteUrl, options = {}) {
         seasonalityStrength = parseFloat(Math.min(1, stdDev / (globalAvg || 1)).toFixed(2));
         const peakDay = dowAverages.indexOf(Math.max(...dowAverages));
         history.forEach(h => {
-            if (h.date && new Date(h.date).getDay() === peakDay)
+            if (h.date && parseMicrosoftDate(h.date).getDay() === peakDay)
                 h.isSeasonalPeak = true;
         });
     }

package/dist/bing/tools/analytics.js

@@ -1,4 +1,5 @@
 import { getBingClient } from '../client.js';
+import { parseMicrosoftDate, startOfDay, endOfDay } from '../../common/utils/dates.js';
 /**
  * Get query performance stats for a Bing site with optional date filtering.
  */
@@ -7,10 +8,10 @@ export async function getQueryStats(siteUrl, startDate, endDate) {
     const stats = await client.getQueryStats(siteUrl);
     if (!startDate && !endDate)
         return stats;
-    const start = startDate ? new Date(startDate) : new Date(0);
-    const end = endDate ? new Date(endDate) : new Date();
+    const start = startDate ? startOfDay(new Date(startDate)) : new Date(0);
+    const end = endDate ? endOfDay(new Date(endDate)) : new Date();
     return stats.filter(row => {
-        const d = new Date(row.Date);
+        const d = parseMicrosoftDate(row.Date);
         return d >= start && d <= end;
     });
 }
@@ -22,10 +23,10 @@ export async function getPageStats(siteUrl, startDate, endDate) {
     const stats = await client.getPageStats(siteUrl);
     if (!startDate && !endDate)
         return stats;
-    const start = startDate ? new Date(startDate) : new Date(0);
-    const end = endDate ? new Date(endDate) : new Date();
+    const start = startDate ? startOfDay(new Date(startDate)) : new Date(0);
+    const end = endDate ? endOfDay(new Date(endDate)) : new Date();
     return stats.filter(row => {
-        const d = new Date(row.Date);
+        const d = parseMicrosoftDate(row.Date);
         return d >= start && d <= end;
     });
 }
@@ -37,10 +38,10 @@ export async function getPageQueryStats(siteUrl, pageUrl, startDate, endDate) {
     const stats = await client.getPageQueryStats(siteUrl, pageUrl);
     if (!startDate && !endDate)
         return stats;
-    const start = startDate ? new Date(startDate) : new Date(0);
-    const end = endDate ? new Date(endDate) : new Date();
+    const start = startDate ? startOfDay(new Date(startDate)) : new Date(0);
+    const end = endDate ? endOfDay(new Date(endDate)) : new Date();
     return stats.filter(row => {
-        const d = new Date(row.Date);
+        const d = parseMicrosoftDate(row.Date);
         return d >= start && d <= end;
     });
 }
@@ -52,10 +53,10 @@ export async function getQueryPageStats(siteUrl, startDate, endDate) {
     const stats = await client.getQueryPageStats(siteUrl);
     if (!startDate && !endDate)
         return stats;
-    const start = startDate ? new Date(startDate) : new Date(0);
-    const end = endDate ? new Date(endDate) : new Date();
+    const start = startDate ? startOfDay(new Date(startDate)) : new Date(0);
+    const end = endDate ? endOfDay(new Date(endDate)) : new Date();
     return stats.filter(row => {
-        const d = new Date(row.Date);
+        const d = parseMicrosoftDate(row.Date);
         return d >= start && d <= end;
     });
 }
@@ -72,10 +73,10 @@ export async function getRankAndTrafficStats(siteUrl) {
 export async function comparePeriods(siteUrl, startDate1, endDate1, startDate2, endDate2) {
     const stats = await getRankAndTrafficStats(siteUrl);
     const getSummary = (start, end) => {
-        const s = new Date(start);
-        const e = new Date(end);
+        const s = startOfDay(new Date(start));
+        const e = endOfDay(new Date(end));
         const filtered = stats.filter((row) => {
-            const d = new Date(row.Date);
+            const d = parseMicrosoftDate(row.Date);
             return d >= s && d <= e;
         });
         const clicks = filtered.reduce((acc, row) => acc + row.Clicks, 0);
@@ -127,7 +128,7 @@ export async function detectAnomalies(siteUrl, options = {}) {
     const threshold = options.threshold || 2.5;
     const stats = await getRankAndTrafficStats(siteUrl);
     // Sort by date ascending
-    const sorted = [...stats].sort((a, b) => new Date(a.Date).getTime() - new Date(b.Date).getTime());
+    const sorted = [...stats].sort((a, b) => parseMicrosoftDate(a.Date).getTime() - parseMicrosoftDate(b.Date).getTime());
     if (sorted.length < 5)
         return [];
     const anomalies = [];
@@ -157,11 +158,11 @@ export async function detectAnomalies(siteUrl, options = {}) {
 export async function getPerformanceSummary(siteUrl, days = 28) {
     const stats = await getRankAndTrafficStats(siteUrl);
     // Bing typically has historical data; filter for last N days
-    const endDate = new Date();
-    const startDate = new Date();
+    const endDate = endOfDay(new Date());
+    const startDate = startOfDay(new Date());
     startDate.setDate(endDate.getDate() - days);
     const filtered = stats.filter((row) => {
-        const d = new Date(row.Date);
+        const d = parseMicrosoftDate(row.Date);
         return d >= startDate && d <= endDate;
     });
     const clicks = filtered.reduce((acc, row) => acc + row.Clicks, 0);
@@ -203,7 +204,7 @@ export async function detectTrends(siteUrl, options = {}) {
     const filterStats = (start, end) => {
         const map = new Map();
         allStats.forEach(stat => {
-            const d = new Date(stat.Date);
+            const d = parseMicrosoftDate(stat.Date);
             if (d >= start && d <= end) {
                 map.set(stat.Query, (map.get(stat.Query) || 0) + stat.Clicks);
             }

package/dist/bing/tools/crawl.js

@@ -3,7 +3,7 @@ import { getBingClient } from '../client.js';
  * Get crawl issues for a site.
  */
 export async function getCrawlIssues(siteUrl) {
-    const client = await getBingClient();
+    const client = await getBingClient(siteUrl);
     return client.getCrawlIssues(siteUrl);
 }
 /**

package/dist/bing/tools/keywords.js

@@ -3,13 +3,13 @@ import { getBingClient } from '../client.js';
  * Get historical stats for a keyword.
  */
 export async function getKeywordStats(q, country, language) {
-    const client = await getBingClient();
+    const client = await getBingClient(); // No siteUrl required for keyword research
     return client.getKeywordStats(q, country, language);
 }
 /**
  * Get related keywords and search volume.
  */
 export async function getRelatedKeywords(q, country, language) {
-    const client = await getBingClient();
+    const client = await getBingClient(); // No siteUrl required for keyword research
     return client.getRelatedKeywords(q, country, language);
 }

package/dist/common/auth/resolver.js

@@ -36,19 +36,29 @@ export async function resolveAccount(siteUrl, engine) {
         return exactMatch;
     // 2. Domain Match (if target is a URL prefix and we have a domain boundary)
     if (normalizedTarget.type === 'url-prefix') {
-        const targetHost = new URL(siteUrl).hostname.toLowerCase();
-        const domainMatch = accounts.find(a => a.websites?.some(w => {
-            const nw = normalizeWebsite(w);
-            return nw.type === 'domain' && (targetHost === nw.value || targetHost.endsWith('.' + nw.value));
-        }));
-        if (domainMatch)
-            return domainMatch;
+        try {
+            const targetHost = new URL(siteUrl).hostname.toLowerCase();
+            const domainMatch = accounts.find(a => a.websites?.some(w => {
+                const nw = normalizeWebsite(w);
+                return nw.type === 'domain' && (targetHost === nw.value || targetHost.endsWith('.' + nw.value));
+            }));
+            if (domainMatch)
+                return domainMatch;
+        }
+        catch (error) {
+            // If the URL is invalid, we can't do a domain match.
+            // Just skip to the next resolution step.
+        }
     }
     // 3. Global Accounts (Empty websites list)
     const globalAccounts = accounts.filter(a => !a.websites || a.websites.length === 0);
     if (globalAccounts.length === 1) {
         return globalAccounts[0];
     }
+    // Single account fallback: If no siteUrl requested and only one account exists, use it.
+    if (!siteUrl && accounts.length === 1) {
+        return accounts[0];
+    }
     if (globalAccounts.length > 1) {
         const error = new Error(`Multiple ${engine} accounts found. Please specify an account boundary or remove unused accounts.`);
         error.code = 'AMBIGUOUS';

package/dist/common/diagnostics.js

@@ -0,0 +1,63 @@
+import { loadConfig } from './auth/config.js';
+import { getSearchConsoleClient } from '../google/client.js';
+import { getBingClient } from '../bing/client.js';
+import { logger } from '../utils/logger.js';
+/**
+ * Runs a set of diagnostic checks to verify API connectivity and account health.
+ */
+export async function runDiagnostics() {
+    const config = await loadConfig();
+    const accounts = Object.values(config.accounts);
+    const results = [];
+    logger.info(`Starting diagnostics for ${accounts.length} accounts...`);
+    logger.info(`System Time: ${new Date().toISOString()}`);
+    logger.info(`Timezone: ${Intl.DateTimeFormat().resolvedOptions().timeZone}`);
+    for (const account of accounts) {
+        logger.debug(`Checking account: ${account.alias} (${account.engine})`);
+        try {
+            if (account.engine === 'google') {
+                const client = await getSearchConsoleClient(undefined, account.id);
+                // Test call: list sites (limited to 1 for quick check)
+                const res = await client.sites.list();
+                results.push({
+                    engine: 'google',
+                    account: account.alias,
+                    status: 'ok',
+                    message: `Successfully connected. Account has access to ${res.data.siteEntry?.length || 0} sites.`,
+                    details: { sitesCount: res.data.siteEntry?.length || 0 }
+                });
+            }
+            else if (account.engine === 'bing') {
+                const client = await getBingClient(undefined, account.id);
+                const res = await client.getSiteList();
+                results.push({
+                    engine: 'bing',
+                    account: account.alias,
+                    status: 'ok',
+                    message: `Successfully connected. Account has access to ${res.length} sites.`,
+                    details: { sitesCount: res.length }
+                });
+            }
+            // Add GA4 diagnostics if needed
+        }
+        catch (e) {
+            const error = e;
+            logger.error(`Diagnostic failed for ${account.alias}: ${error.message}`);
+            results.push({
+                engine: account.engine,
+                account: account.alias,
+                status: 'error',
+                message: error.message
+            });
+        }
+    }
+    if (accounts.length === 0) {
+        results.push({
+            engine: 'system',
+            account: 'none',
+            status: 'error',
+            message: 'No accounts configured. Run setup first.'
+        });
+    }
+    return results;
+}

package/dist/common/utils/csv.js

@@ -6,12 +6,18 @@ export function jsonToCsv(data) {
     if (!data || data.length === 0) {
         return "";
     }
-    // Get headers from the first object
-    const headers = Object.keys(data[0]);
+    // Get all unique headers from all objects
+    const headerSet = new Set();
+    for (const row of data) {
+        if (row && typeof row === 'object') {
+            Object.keys(row).forEach(key => headerSet.add(key));
+        }
+    }
+    const headers = Array.from(headerSet);
     const csvRows = [headers.join(',')];
     for (const row of data) {
         const values = headers.map(header => {
-            const val = row[header];
+            const val = row && typeof row === 'object' ? row[header] : undefined;
             const stringVal = val === undefined || val === null ? '' : String(val);
             // Escape double quotes by doubling them
             const escaped = stringVal.replace(/"/g, '""');

package/dist/common/utils/dates.js

@@ -0,0 +1,32 @@
+/**
+ * Parses a Microsoft-style JSON date string (e.g., "/Date(1731225600000-0800)/")
+ * into a standard JavaScript Date object.
+ */
+export function parseMicrosoftDate(dateStr) {
+    if (!dateStr)
+        return new Date(0);
+    // Extract the timestamp digits
+    const match = dateStr.match(/\/Date\((\d+)([+-]\d+)?\)\//);
+    if (match) {
+        const timestamp = parseInt(match[1], 10);
+        return new Date(timestamp);
+    }
+    // Fallback to standard Date parsing if format doesn't match
+    return new Date(dateStr);
+}
+/**
+ * Normalizes a date to the start of the day (00:00:00.000) in local time.
+ */
+export function startOfDay(date) {
+    const d = new Date(date);
+    d.setHours(0, 0, 0, 0);
+    return d;
+}
+/**
+ * Normalizes a date to the end of the day (23:59:59.999) in local time.
+ */
+export function endOfDay(date) {
+    const d = new Date(date);
+    d.setHours(23, 59, 59, 999);
+    return d;
+}

package/dist/ga4/tools/analytics.js

@@ -9,9 +9,12 @@ export function clearAnalyticsCache() {
 function generateCacheKey(options) {
     // Recursive stable stringify to handle nested object key ordering
     const sortObject = (obj) => {
-        if (obj === null || typeof obj !== 'object' || Array.isArray(obj)) {
+        if (obj === null || typeof obj !== 'object') {
             return obj;
         }
+        if (Array.isArray(obj)) {
+            return obj.map(sortObject);
+        }
         const sorted = {};
         Object.keys(obj).sort().forEach(key => {
             sorted[key] = sortObject(obj[key]);
@@ -121,7 +124,7 @@ export async function queryAnalytics(options) {
     analyticsCache.set(cacheKey, { type: 'pending', promise: fetchPromise });
     return fetchPromise;
 }
-export async function getPagePerformance(propertyId, startDate, endDate, pagePath, limit = 50, accountId) {
+export async function getPagePerformance(propertyId, startDate, endDate, pagePath, limit = 50, accountId, offset) {
     const dimensionFilter = pagePath ? {
         filter: {
             fieldName: 'pagePath',
@@ -148,11 +151,12 @@ export async function getPagePerformance(propertyId, startDate, endDate, pagePat
         ],
         dimensionFilter,
         limit,
+        offset,
         orderBys: [{ metric: { metricName: 'sessions' }, desc: true }]
     });
     return formatRows(response);
 }
-export async function getTrafficSources(propertyId, startDate, endDate, channelGroup, limit = 50, accountId) {
+export async function getTrafficSources(propertyId, startDate, endDate, channelGroup, limit = 50, accountId, offset) {
     const dimensionFilter = channelGroup ? {
         filter: {
             fieldName: 'sessionDefaultChannelGroup',
@@ -172,11 +176,12 @@ export async function getTrafficSources(propertyId, startDate, endDate, channelG
         metrics: ['sessions'],
         dimensionFilter,
         limit,
+        offset,
         orderBys: [{ metric: { metricName: 'sessions' }, desc: true }]
     });
     return formatRows(response);
 }
-export async function getOrganicLandingPages(propertyId, startDate, endDate, limit = 50, accountId) {
+export async function getOrganicLandingPages(propertyId, startDate, endDate, limit = 50, accountId, offset) {
     const response = await queryAnalytics({
         propertyId,
         accountId,
@@ -201,11 +206,12 @@ export async function getOrganicLandingPages(propertyId, startDate, endDate, lim
             }
         },
         limit,
+        offset,
         orderBys: [{ metric: { metricName: 'sessions' }, desc: true }]
     });
     return formatRows(response);
 }
-export async function getContentPerformance(propertyId, startDate, endDate, limit = 50, accountId) {
+export async function getContentPerformance(propertyId, startDate, endDate, limit = 50, accountId, offset) {
     // Try to query content group first?
     // Not sure if contentGroup is standard. 'contentGroup' is a standard dimension.
     // If not used, it might return (not set).
@@ -217,6 +223,7 @@ export async function getContentPerformance(propertyId, startDate, endDate, limi
         dimensions: ['contentGroup'], // Fallback to pagePath if needed? No, separate tool or option.
         metrics: ['sessions', 'averageSessionDuration', 'conversions'],
         limit,
+        offset,
         orderBys: [{ metric: { metricName: 'sessions' }, desc: true }]
     });
     const rows = formatRows(response);
@@ -228,7 +235,7 @@ export async function getContentPerformance(propertyId, startDate, endDate, limi
     }
     return rows;
 }
-export async function getEcommerce(propertyId, startDate, endDate, limit = 50, accountId) {
+export async function getEcommerce(propertyId, startDate, endDate, limit = 50, accountId, offset) {
     const response = await queryAnalytics({
         propertyId,
         accountId,
@@ -237,6 +244,7 @@ export async function getEcommerce(propertyId, startDate, endDate, limit = 50, a
         dimensions: ['itemName'],
         metrics: ['itemRevenue', 'itemsPurchased', 'ecommercePurchases'],
         limit,
+        offset,
         orderBys: [{ metric: { metricName: 'itemRevenue' }, desc: true }]
     });
     // Check if we have data. If total revenue is 0 across all rows, maybe return warning.

package/dist/ga4/tools/pagespeed.js

@@ -1,5 +1,6 @@
 import { getOrganicLandingPages } from './analytics.js';
 import { analyzePageSpeed } from '../../google/tools/pagespeed.js';
+import { limitConcurrency } from '../../common/concurrency.js';
 export async function getPageSpeedCorrelation(propertyId, domain, startDate, endDate, limit = 5, strategy = 'mobile', accountId) {
     // Normalize domain
     let baseUrl = domain.trim();
@@ -11,28 +12,25 @@ export async function getPageSpeedCorrelation(propertyId, domain, startDate, end
     }
     // 1. Get top organic landing pages
     const pages = await getOrganicLandingPages(propertyId, startDate, endDate, limit, accountId);
-    // 2. Run PageSpeed on each
-    const results = await Promise.allSettled(pages.map(async (page) => {
-        const path = page.landingPagePlusQueryString || page.pagePath;
-        if (!path)
-            throw new Error("No page path found");
-        const fullUrl = `${baseUrl}${path.startsWith('/') ? '' : '/'}${path}`;
-        const psiResult = await analyzePageSpeed(fullUrl, strategy);
-        return {
-            ...page,
-            pageSpeed: psiResult
-        };
-    }));
-    // 3. Merge
-    return results.map((res, index) => {
-        if (res.status === 'fulfilled') {
-            return res.value;
+    // 2. Run PageSpeed on each with concurrency limit
+    const results = await limitConcurrency(pages, 5, async (page) => {
+        try {
+            const path = page.landingPagePlusQueryString || page.pagePath;
+            if (!path)
+                throw new Error("No page path found");
+            const fullUrl = `${baseUrl}${path.startsWith('/') ? '' : '/'}${path}`;
+            const psiResult = await analyzePageSpeed(fullUrl, strategy);
+            return {
+                ...page,
+                pageSpeed: psiResult
+            };
         }
-        else {
+        catch (error) {
             return {
-                ...pages[index],
-                pageSpeedError: res.reason?.message || "Failed to analyze"
+                ...page,
+                pageSpeedError: error.message || "Failed to analyze"
             };
         }
     });
+    return results;
 }

package/dist/ga4/tools/properties.js

@@ -0,0 +1,28 @@
+import { loadConfig } from '../../common/auth/config.js';
+/**
+ * List configured GA4 properties.
+ * Since GA4 properties are configured explicitly during setup,
+ * we return the configured properties.
+ */
+export async function listProperties(accountId) {
+    const config = await loadConfig();
+    const accounts = Object.values(config.accounts).filter(a => a.engine === 'ga4');
+    if (accountId) {
+        const account = accounts.find(a => a.id === accountId);
+        if (!account) {
+            throw new Error(`GA4 account ${accountId} not found.`);
+        }
+        return [{
+                id: account.id,
+                alias: account.alias,
+                propertyId: account.ga4PropertyId,
+                siteUrl: account.ga4PropertyId // Alias for sites_list consistency
+            }];
+    }
+    return accounts.map(a => ({
+        id: a.id,
+        alias: a.alias,
+        propertyId: a.ga4PropertyId,
+        siteUrl: a.ga4PropertyId // Alias for sites_list consistency
+    }));
+}

package/dist/google/client.js

@@ -2,6 +2,7 @@ import { google } from 'googleapis';
 import nodeMachineId from 'node-machine-id';
 import { loadConfig, updateAccount, removeAccount } from '../common/auth/config.js';
 import { resolveAccount } from '../common/auth/resolver.js';
+import { logger } from '../utils/logger.js';
 const { machineIdSync } = nodeMachineId;
 const SCOPES = [
     'https://www.googleapis.com/auth/webmasters.readonly',
@@ -32,8 +33,10 @@ export async function getSearchConsoleClient(siteUrl, accountId) {
     }
     const cacheKey = account.id;
     if (cachedClientMap[cacheKey]) {
+        logger.debug(`Using cached client for account: ${account.alias} (${account.id})`);
         return cachedClientMap[cacheKey];
     }
+    logger.debug(`Initializing Search Console client for ${account.alias} (ID: ${account.id}, Engine: ${account.engine})`);
     // 2. Load Tokens
     const tokens = await loadTokensForAccount(account);
     if (tokens) {
@@ -42,16 +45,18 @@ export async function getSearchConsoleClient(siteUrl, accountId) {
             oauth2Client.setCredentials(tokens);
             // Check for expiry (refresh if needed)
             if (tokens.expiry_date && tokens.expiry_date <= Date.now()) {
+                logger.debug(`Tokens expired for ${account.alias}, refreshing...`);
                 const { credentials } = await oauth2Client.refreshAccessToken();
                 await saveTokensForAccount(account, credentials);
                 oauth2Client.setCredentials(credentials);
             }
             const client = google.searchconsole({ version: 'v1', auth: oauth2Client });
+            logger.debug(`Client successfully initialized with OAuth2 for ${account.alias}`);
             cachedClientMap[cacheKey] = client;
             return client;
         }
         catch (error) {
-            console.error(`Failed to use tokens for account ${account.alias}:`, error.message);
+            logger.error(`Failed to use tokens for account ${account.alias}:`, error.message);
         }
     }
     // 3. Support Service Account Path (Multi-Account)
@@ -62,6 +67,7 @@ export async function getSearchConsoleClient(siteUrl, accountId) {
         });
         const client = google.searchconsole({ version: 'v1', auth });
         cachedClientMap[cacheKey] = client;
+        logger.debug(`Client initialized with Service Account Path for ${account.alias}`);
         return client;
     }
     // 4. Fallback to Service Account (Environment Variables) - Only if no specific account was resolved or it was a legacy fallback

package/dist/google/tools/analytics.js

@@ -1,4 +1,5 @@
 import { getSearchConsoleClient } from '../client.js';
+import { logger } from '../../utils/logger.js';
 const CACHE_TTL_MS = 60 * 1000; // 60 seconds
 const MAX_CACHE_SIZE = 100;
 const analyticsCache = new Map();
@@ -32,9 +33,11 @@ export async function queryAnalytics(options) {
     const cached = analyticsCache.get(cacheKey);
     if (cached) {
         if ('then' in cached) {
+            logger.debug(`Cache hit (pending) for ${options.siteUrl}`);
             return cached;
         }
         if (now - cached.timestamp < CACHE_TTL_MS) {
+            logger.debug(`Cache hit (fresh) for ${options.siteUrl}`);
             // LRU: Refresh key position
             analyticsCache.delete(cacheKey);
             analyticsCache.set(cacheKey, cached);
@@ -48,7 +51,7 @@ export async function queryAnalytics(options) {
             const requestBody = {
                 startDate: options.startDate,
                 endDate: options.endDate,
-                dimensions: options.dimensions || [],
+                dimensions: (options.dimensions && options.dimensions.length > 0) ? options.dimensions : undefined,
                 type: options.type || 'web',
                 aggregationType: options.aggregationType || 'auto',
                 dataState: options.dataState || 'final',
@@ -70,11 +73,18 @@ export async function queryAnalytics(options) {
                         }]
                 }));
             }
+            logger.debug(`Fetching analytics for ${options.siteUrl}`, {
+                startDate: options.startDate,
+                endDate: options.endDate,
+                dimensions: options.dimensions,
+                filters: options.filters?.length || 0
+            });
             const res = await client.searchanalytics.query({
                 siteUrl: options.siteUrl,
                 requestBody
             });
             const rows = res.data.rows || [];
+            logger.debug(`Received ${rows.length} rows for ${options.siteUrl}`);
             analyticsCache.set(cacheKey, {
                 data: rows,
                 timestamp: Date.now()
@@ -88,6 +98,7 @@ export async function queryAnalytics(options) {
             return rows;
         }
         catch (error) {
+            logger.error(`Error fetching analytics for ${options.siteUrl}:`, error.message);
             analyticsCache.delete(cacheKey);
             throw error;
         }
@@ -104,7 +115,7 @@ export async function queryAnalytics(options) {
  * @returns Combined metrics for the requested period.
  */
 export async function getPerformanceSummary(siteUrl, days = 28) {
-    const DATA_DELAY_DAYS = 3;
+    const DATA_DELAY_DAYS = 1; // Use 1 day delay with 'all' dataState (fresh data)
     const endDate = new Date();
     endDate.setDate(endDate.getDate() - DATA_DELAY_DAYS);
     const startDate = new Date(endDate);
@@ -115,6 +126,7 @@ export async function getPerformanceSummary(siteUrl, days = 28) {
         siteUrl,
         startDate: startDateStr,
         endDate: endDateStr,
+        dataState: 'all',
         limit: 1
     });
     if (rows.length > 0) {

package/dist/google/tools/inspection.js

@@ -9,7 +9,7 @@ import { limitConcurrency } from '../../common/concurrency.js';
  * @returns Comprehensive indexing and status information for the URL.
  */
 export async function inspectUrl(siteUrl, inspectionUrl, languageCode = 'en-US') {
-    const client = await getSearchConsoleClient();
+    const client = await getSearchConsoleClient(siteUrl);
     const res = await client.urlInspection.index.inspect({
         requestBody: {
             inspectionUrl,

package/dist/google/tools/sitemaps.js

@@ -6,7 +6,7 @@ import { getSearchConsoleClient } from '../client.js';
  * @returns A list of sitemap metadata objects.
  */
 export async function listSitemaps(siteUrl) {
-    const client = await getSearchConsoleClient();
+    const client = await getSearchConsoleClient(siteUrl);
     const res = await client.sitemaps.list({ siteUrl });
     return res.data.sitemap || [];
 }
@@ -18,7 +18,7 @@ export async function listSitemaps(siteUrl) {
  * @returns A success message.
  */
 export async function submitSitemap(siteUrl, feedpath) {
-    const client = await getSearchConsoleClient();
+    const client = await getSearchConsoleClient(siteUrl);
     await client.sitemaps.submit({ siteUrl, feedpath });
     return `Successfully submitted sitemap: ${feedpath} for ${siteUrl}`;
 }
@@ -30,7 +30,7 @@ export async function submitSitemap(siteUrl, feedpath) {
  * @returns A success message.
  */
 export async function deleteSitemap(siteUrl, feedpath) {
-    const client = await getSearchConsoleClient();
+    const client = await getSearchConsoleClient(siteUrl);
     await client.sitemaps.delete({ siteUrl, feedpath });
     return `Successfully deleted sitemap: ${feedpath} from ${siteUrl}`;
 }
@@ -42,7 +42,7 @@ export async function deleteSitemap(siteUrl, feedpath) {
  * @returns Sitemap details including status and item counts.
  */
 export async function getSitemap(siteUrl, feedpath) {
-    const client = await getSearchConsoleClient();
+    const client = await getSearchConsoleClient(siteUrl);
     const res = await client.sitemaps.get({ siteUrl, feedpath });
     return res.data;
 }

package/dist/index.js

@@ -32,7 +32,10 @@ import * as ga4Behavior from "./ga4/tools/behavior.js";
 import * as ga4PageSpeed from "./ga4/tools/pagespeed.js";
 import * as ga4GscComparator from "./common/tools/compare-engines/ga4-gsc-comparator.js";
 import * as ga4GscBingComparator from "./common/tools/compare-engines/ga4-gsc-bing-comparator.js";
+import * as ga4Properties from "./ga4/tools/properties.js";
 import { loadConfig, removeAccount, updateAccount } from './common/auth/config.js';
+import { normalizeWebsite } from './common/auth/resolver.js';
+import { limitConcurrency } from './common/concurrency.js';
 import { bingApiDocs, indexNowDocs, dimensionsDocs as bingDimensionsDocs, filtersDocs as bingFiltersDocs, searchTypesDocs as bingSearchTypesDocs, patternsDocs as bingPatternsDocs, algorithmUpdatesDocs as bingAlgorithmUpdatesDocs } from "./bing/docs/index.js";
 import { formatError } from "./common/errors.js";
 import { existsSync } from "fs";
@@ -45,6 +48,8 @@ import { dirname } from 'path';
 import { getStartedHandler, getStartedToolName, getStartedToolDescription, getStartedToolSchema } from "./common/tools/get-started.js";
 import { registerPrompts } from "./prompts/index.js";
 import { jsonToCsv } from "./common/utils/csv.js";
+import { runDiagnostics } from "./common/diagnostics.js";
+import { logger } from "./utils/logger.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 // Load version from package.json
@@ -64,7 +69,7 @@ const server = new McpServer({
 // Get Started Tool
 server.tool(getStartedToolName, getStartedToolDescription, getStartedToolSchema, getStartedHandler);
 // Sites Tools
-server.tool("sites_list", "List all verified sites across all authorized accounts", { engine: z.enum(["google", "bing"]).optional().describe("The search engine (default: google)") }, async ({ engine = "google" }) => {
+server.tool("sites_list", "List all verified sites or properties across all authorized accounts", { engine: z.enum(["google", "bing", "ga4"]).optional().describe("The search engine (default: google)") }, async ({ engine = "google" }) => {
     try {
         const config = await loadConfig();
         const accounts = Object.values(config.accounts).filter(a => a.engine === engine);
@@ -73,26 +78,64 @@ server.tool("sites_list", "List all verified sites across all authorized account
             const results = await bingSites.listSites();
             return { content: [{ type: "text", text: JSON.stringify(results, null, 2) }] };
         }
-        const allResults = [];
-        for (const account of accounts) {
+        const allResults = await limitConcurrency(accounts, 5, async (account) => {
             try {
-                const results = engine === "google"
-                    ? await sites.listSites(account.id)
-                    : await bingSites.listSites(account.id);
-                allResults.push({
+                let results;
+                if (engine === "google") {
+                    results = await sites.listSites(account.id);
+                }
+                else if (engine === "bing") {
+                    results = await bingSites.listSites(account.id);
+                }
+                else if (engine === "ga4") {
+                    results = await ga4Properties.listProperties(account.id);
+                }
+                else {
+                    results = [];
+                }
+                const rawCount = results.length;
+                // Boundary Filtering: Honor the website in the config
+                if (account.websites && account.websites.length > 0) {
+                    results = results.filter(site => {
+                        const url = engine === "ga4" ? (site.propertyId) : (site.siteUrl || site.Url);
+                        if (!url)
+                            return false;
+                        // If it's a numeric property ID (GA4), check direct inclusion
+                        if (engine === "ga4" && /^\d+$/.test(url)) {
+                            return account.websites.includes(url);
+                        }
+                        try {
+                            const normalizedSite = normalizeWebsite(url).value;
+                            const isMatch = account.websites.some(w => normalizeWebsite(w).value === normalizedSite);
+                            if (!isMatch) {
+                                logger.debug(`Filtered out site ${url} for account ${account.alias} (not in whitelist)`);
+                            }
+                            return isMatch;
+                        }
+                        catch {
+                            return account.websites.includes(url);
+                        }
+                    });
+                    logger.debug(`Account ${account.alias}: ${results.length}/${rawCount} sites kept after filtering.`);
+                }
+                else {
+                    logger.debug(`Account ${account.alias}: Found ${results.length} sites (no filtering).`);
+                }
+                return {
                     account: account.alias,
                     accountId: account.id,
                     sites: results
-                });
+                };
             }
             catch (e) {
-                allResults.push({
+                logger.error(`Failed to list sites for account ${account.alias}:`, e.message);
+                return {
                     account: account.alias,
                     accountId: account.id,
                     error: e.message
-                });
+                };
             }
-        }
+        });
         return {
             content: [{ type: "text", text: JSON.stringify(allResults, null, 2) }]
         };
@@ -101,6 +144,49 @@ server.tool("sites_list", "List all verified sites across all authorized account
         return formatError(error);
     }
 });
+server.tool("bing_seo_cannibalization", "Detect pages competing for the same query in Bing.", {
+    siteUrl: z.string().describe("The URL of the site"),
+    minImpressions: z.number().optional().describe("Minimum impressions threshold (default 50)")
+}, async ({ siteUrl, minImpressions }) => {
+    try {
+        const results = await bingSeoInsights.detectCannibalization(siteUrl, { minImpressions });
+        return {
+            content: [{ type: "text", text: JSON.stringify(results, null, 2) }]
+        };
+    }
+    catch (error) {
+        return formatError(error);
+    }
+});
+server.tool("bing_seo_lost_queries", "Identify queries that lost significant traffic on Bing compared to the previous period.", {
+    siteUrl: z.string().describe("The URL of the site"),
+    days: z.number().optional().describe("Lookback period in days (default 28)")
+}, async ({ siteUrl, days }) => {
+    try {
+        const results = await bingSeoInsights.findLostQueries(siteUrl, { days });
+        return {
+            content: [{ type: "text", text: JSON.stringify(results, null, 2) }]
+        };
+    }
+    catch (error) {
+        return formatError(error);
+    }
+});
+server.tool("bing_brand_analysis", "Analyze Brand vs Non-Brand performance on Bing.", {
+    siteUrl: z.string().describe("The URL of the site"),
+    brandRegex: z.string().describe("Regex matching brand terms (e.g. 'acme|acmecorp')"),
+    days: z.number().optional().describe("Number of days to analyze (default 28)")
+}, async ({ siteUrl, brandRegex, days }) => {
+    try {
+        const results = await bingSeoInsights.analyzeBrandVsNonBrand(siteUrl, brandRegex, { days });
+        return {
+            content: [{ type: "text", text: JSON.stringify(results, null, 2) }]
+        };
+    }
+    catch (error) {
+        return formatError(error);
+    }
+});
 server.tool("bing_analytics_trends", "Detect rising or declining trends in Bing query performance", {
     siteUrl: z.string().describe("The URL of the site"),
     days: z.number().optional().describe("Number of days to analyze (default 28)"),
@@ -1284,10 +1370,11 @@ server.tool("analytics_page_performance", "Get detailed page performance metrics
     endDate: z.string().describe("End date (YYYY-MM-DD)"),
     pagePath: z.string().optional().describe("Filter by specific page path"),
     limit: z.number().optional().describe("Max rows (default 50)"),
+    offset: z.number().optional().describe("Starting row for pagination (0-based)"),
     format: z.enum(["json", "csv"]).optional().describe("Output format (default: json)")
-}, async ({ propertyId, accountId, startDate, endDate, pagePath, limit, format }) => {
+}, async ({ propertyId, accountId, startDate, endDate, pagePath, limit, offset, format }) => {
     try {
-        const result = await ga4Analytics.getPagePerformance(propertyId, startDate, endDate, pagePath, limit, accountId);
+        const result = await ga4Analytics.getPagePerformance(propertyId, startDate, endDate, pagePath, limit, accountId, offset);
         if (format === 'csv') {
             return {
                 content: [{ type: "text", text: jsonToCsv(result) }]
@@ -1307,10 +1394,11 @@ server.tool("analytics_traffic_sources", "Analyze traffic sources (Channel, Sour
     startDate: z.string().describe("Start date (YYYY-MM-DD)"),
     endDate: z.string().describe("End date (YYYY-MM-DD)"),
     channelGroup: z.string().optional().describe("Filter by Channel Group (e.g. 'Organic Search')"),
-    limit: z.number().optional().describe("Max rows (default 50)")
-}, async ({ propertyId, accountId, startDate, endDate, channelGroup, limit }) => {
+    limit: z.number().optional().describe("Max rows (default 50)"),
+    offset: z.number().optional().describe("Starting row for pagination (0-based)")
+}, async ({ propertyId, accountId, startDate, endDate, channelGroup, limit, offset }) => {
     try {
-        const result = await ga4Analytics.getTrafficSources(propertyId, startDate, endDate, channelGroup, limit, accountId);
+        const result = await ga4Analytics.getTrafficSources(propertyId, startDate, endDate, channelGroup, limit, accountId, offset);
         return {
             content: [{ type: "text", text: JSON.stringify(result, null, 2) }]
         };
@@ -1324,10 +1412,11 @@ server.tool("analytics_organic_landing_pages", "Get performance of organic landi
     accountId: z.string().optional().describe("GA4 account ID for multi-account setups"),
     startDate: z.string().describe("Start date (YYYY-MM-DD)"),
     endDate: z.string().describe("End date (YYYY-MM-DD)"),
-    limit: z.number().optional().describe("Max rows (default 50)")
-}, async ({ propertyId, accountId, startDate, endDate, limit }) => {
+    limit: z.number().optional().describe("Max rows (default 50)"),
+    offset: z.number().optional().describe("Starting row for pagination (0-based)")
+}, async ({ propertyId, accountId, startDate, endDate, limit, offset }) => {
     try {
-        const result = await ga4Analytics.getOrganicLandingPages(propertyId, startDate, endDate, limit, accountId);
+        const result = await ga4Analytics.getOrganicLandingPages(propertyId, startDate, endDate, limit, accountId, offset);
         return {
             content: [{ type: "text", text: JSON.stringify(result, null, 2) }]
         };
@@ -1341,10 +1430,11 @@ server.tool("analytics_content_performance", "Analyze content performance by Con
     accountId: z.string().optional().describe("GA4 account ID for multi-account setups"),
     startDate: z.string().describe("Start date (YYYY-MM-DD)"),
     endDate: z.string().describe("End date (YYYY-MM-DD)"),
-    limit: z.number().optional().describe("Max rows (default 50)")
-}, async ({ propertyId, accountId, startDate, endDate, limit }) => {
+    limit: z.number().optional().describe("Max rows (default 50)"),
+    offset: z.number().optional().describe("Starting row for pagination (0-based)")
+}, async ({ propertyId, accountId, startDate, endDate, limit, offset }) => {
     try {
-        const result = await ga4Analytics.getContentPerformance(propertyId, startDate, endDate, limit, accountId);
+        const result = await ga4Analytics.getContentPerformance(propertyId, startDate, endDate, limit, accountId, offset);
         return {
             content: [{ type: "text", text: JSON.stringify(result, null, 2) }]
         };
@@ -1358,10 +1448,11 @@ server.tool("analytics_ecommerce", "Get ecommerce performance (products, revenue
     accountId: z.string().optional().describe("GA4 account ID for multi-account setups"),
     startDate: z.string().describe("Start date (YYYY-MM-DD)"),
     endDate: z.string().describe("End date (YYYY-MM-DD)"),
-    limit: z.number().optional().describe("Max rows (default 50)")
-}, async ({ propertyId, accountId, startDate, endDate, limit }) => {
+    limit: z.number().optional().describe("Max rows (default 50)"),
+    offset: z.number().optional().describe("Starting row for pagination (0-based)")
+}, async ({ propertyId, accountId, startDate, endDate, limit, offset }) => {
     try {
-        const result = await ga4Analytics.getEcommerce(propertyId, startDate, endDate, limit, accountId);
+        const result = await ga4Analytics.getEcommerce(propertyId, startDate, endDate, limit, accountId, offset);
         return {
             content: [{ type: "text", text: JSON.stringify(result, null, 2) }]
         };
@@ -1902,8 +1993,19 @@ If any site has a 'critical' or 'warning' status:
             }]
     };
 });
-// Register additional prompts
 registerPrompts(server);
+// Diagnostics Tool
+server.tool("diagnostics", "Run connectivity diagnostics for all connected accounts. Use this to troubleshoot '0 results' or authentication issues.", {}, async () => {
+    try {
+        const results = await runDiagnostics();
+        return {
+            content: [{ type: "text", text: JSON.stringify(results, null, 2) }]
+        };
+    }
+    catch (error) {
+        return formatError(error);
+    }
+});
 async function main() {
     const command = process.argv[2];
     // Handle standalone commands
@@ -1927,6 +2029,16 @@ async function main() {
         await login();
         return;
     }
+    if (command === 'diagnostics') {
+        const results = await runDiagnostics();
+        console.log(JSON.stringify(results, null, 2));
+        return;
+    }
+    if (command === 'sites') {
+        const { main: accountsMain } = await import('./accounts.js');
+        await accountsMain(['list']);
+        return;
+    }
     // Check for credentials
     const config = await loadConfig();
     const accounts = Object.values(config.accounts);

package/dist/utils/logger.js

@@ -0,0 +1,39 @@
+/**
+ * Logging utility for Search Console MCP.
+ * Since this is a stdio-based MCP server, we must log to stderr
+ * to avoid interfering with the MCP protocol on stdout.
+ */
+import { colors } from './ui.js';
+const isDebugEnabled = process.env.DEBUG === 'true' || process.env.NODE_ENV === 'development';
+export const logger = {
+    /**
+     * Log a debug message. Only visible if DEBUG=true or NODE_ENV=development.
+     */
+    debug(message, ...args) {
+        if (isDebugEnabled) {
+            const timestamp = new Date().toISOString();
+            console.error(`${colors.dim}[${timestamp}]${colors.reset} ${colors.blue}[DEBUG]${colors.reset} ${message}`, ...args);
+        }
+    },
+    /**
+     * Log an error message. Always visible.
+     */
+    error(message, error) {
+        const timestamp = new Date().toISOString();
+        console.error(`${colors.dim}[${timestamp}]${colors.reset} ${colors.red}[ERROR]${colors.reset} ${message}`, error || '');
+    },
+    /**
+     * Log an info message. Always visible.
+     */
+    info(message, ...args) {
+        const timestamp = new Date().toISOString();
+        console.error(`${colors.dim}[${timestamp}]${colors.reset} ${colors.green}[INFO]${colors.reset} ${message}`, ...args);
+    },
+    /**
+     * Log a warning message. Always visible.
+     */
+    warn(message, ...args) {
+        const timestamp = new Date().toISOString();
+        console.error(`${colors.dim}[${timestamp}]${colors.reset} ${colors.yellow}[WARN]${colors.reset} ${message}`, ...args);
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "search-console-mcp",
-  "version": "1.13.2",
+  "version": "1.13.4",
   "mcpName": "io.github.saurabhsharma2u/search-console-mcp",
   "description": "MCP server for Google Search Console, Bing Webmaster Tools, and Google Analytics 4",
   "type": "module",
@@ -32,13 +32,13 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@adobe/structured-data-validator": "^1.6.0",
+    "@adobe/structured-data-validator": "^1.7.0",
     "@google-analytics/data": "^5.2.1",
     "@modelcontextprotocol/sdk": "^1.26.0",
     "@napi-rs/keyring": "^1.2.0",
     "cheerio": "^1.2.0",
     "dotenv": "^17.3.1",
-    "googleapis": "^171.0.0",
+    "googleapis": "^171.4.0",
     "node-machine-id": "^1.1.12",
     "open": "^11.0.0",
     "re2": "^1.23.3",
@@ -52,4 +52,4 @@
     "typescript": "^5.9.3",
     "vitest": "^4.0.18"
   }
-}
+}