@gscdump/sdk 0.33.0 → 0.33.3

package/dist/index.d.mts

@@ -317,7 +317,7 @@ interface GscDailySummary {
     impressions: number;
   }>;
 }
-/** Fill `sum_position` from `position * impressions` when the row only carries `position`. */
+/** Fill `sum_position` from `(position - 1) * impressions` when the row only carries `position`. */
 declare function coerceRowMetrics<T extends {
   impressions: number;
   sum_position?: number;

package/dist/index.mjs

@@ -8,6 +8,125 @@ import { resolveWindow } from "@gscdump/engine/period";
 import { endOfMonth, format, startOfMonth, startOfQuarter, startOfWeek, subDays, subMonths } from "date-fns";
 import { CANONICAL_WEBHOOK_EVENTS, VALID_WEBHOOK_EVENTS, WEBHOOK_CONTRACT_VERSION, WEBHOOK_CONTRACT_VERSION_HEADER, WEBHOOK_CONTRACT_VERSION_HEADER as WEBHOOK_CONTRACT_VERSION_HEADER$1, WEBHOOK_DELIVERY_HEADER, WEBHOOK_DELIVERY_HEADER as WEBHOOK_DELIVERY_HEADER$1, WEBHOOK_EVENT_HEADER, WEBHOOK_EVENT_HEADER as WEBHOOK_EVENT_HEADER$1, WEBHOOK_SIGNATURE_HEADER, WEBHOOK_SIGNATURE_HEADER as WEBHOOK_SIGNATURE_HEADER$1, WEBHOOK_TIMESTAMP_HEADER, WEBHOOK_TIMESTAMP_HEADER as WEBHOOK_TIMESTAMP_HEADER$1, partnerWebhookEnvelopeSchema } from "@gscdump/contracts";
 export * from "@gscdump/contracts";
+function isAnalysisSourcesOptions(value) {
+	return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function withDefaultSearchType(value, searchType) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return value;
+	const scoped = value;
+	return {
+		...scoped,
+		searchType: searchType ?? scoped.searchType ?? "web"
+	};
+}
+function searchTypeQuery(searchType) {
+	return { searchType: searchType ?? "web" };
+}
+function dateRangeOptionsQuery(options) {
+	const query = {};
+	const start = options?.start ?? options?.startDate;
+	const end = options?.end ?? options?.endDate;
+	if (start) query.start = start;
+	if (end) query.end = end;
+	return query;
+}
+function sourceInfoQuery(options) {
+	return {
+		...searchTypeQuery(options?.searchType),
+		...dateRangeOptionsQuery(options)
+	};
+}
+function tablesQuery(tablesOrOptions, options) {
+	const tables = isAnalysisSourcesOptions(tablesOrOptions) ? tablesOrOptions.tables : tablesOrOptions;
+	const source = isAnalysisSourcesOptions(tablesOrOptions) ? tablesOrOptions : options;
+	const query = {
+		...searchTypeQuery(source?.searchType),
+		...dateRangeOptionsQuery(source)
+	};
+	if (tables) query.tables = Array.isArray(tables) ? tables.join(",") : tables;
+	return query;
+}
+function dataQuery(state, options) {
+	const opts = options;
+	const scoped = withDefaultSearchType(state, opts?.searchType);
+	const query = {
+		q: JSON.stringify(scoped),
+		searchType: scoped.searchType ?? "web"
+	};
+	if (opts?.comparison) query.qc = JSON.stringify(withDefaultSearchType(opts.comparison, scoped.searchType));
+	if (opts?.filter) query.filter = opts.filter;
+	return query;
+}
+function dataDetailQuery(state, options) {
+	const opts = options;
+	const scoped = withDefaultSearchType(state, opts?.searchType);
+	const query = {
+		q: JSON.stringify(scoped),
+		searchType: scoped.searchType ?? "web"
+	};
+	if (opts?.comparison) query.qc = JSON.stringify(withDefaultSearchType(opts.comparison, scoped.searchType));
+	return query;
+}
+function analysisQuery(params) {
+	const query = {
+		preset: params.preset,
+		startDate: params.startDate,
+		endDate: params.endDate
+	};
+	if (params.prevStartDate) query.prevStartDate = params.prevStartDate;
+	if (params.prevEndDate) query.prevEndDate = params.prevEndDate;
+	if (params.brandTerms) query.brandTerms = params.brandTerms;
+	if (params.limit != null) query.limit = params.limit;
+	if (params.offset != null) query.offset = params.offset;
+	if (params.search) query.search = params.search;
+	if (params.minImpressions != null) query.minImpressions = params.minImpressions;
+	if (params.minPosition != null) query.minPosition = params.minPosition;
+	if (params.maxPosition != null) query.maxPosition = params.maxPosition;
+	if (params.maxCtr != null) query.maxCtr = params.maxCtr;
+	query.searchType = params.searchType ?? "web";
+	return query;
+}
+function indexingUrlsQuery(params = {}) {
+	const query = {};
+	if (params.limit != null) query.limit = params.limit;
+	if (params.offset != null) query.offset = params.offset;
+	if (params.status) query.status = params.status;
+	if (params.issue) query.issue = params.issue;
+	if (params.search) query.search = params.search;
+	return query;
+}
+function indexingDiagnosticsQuery(params = {}) {
+	const query = {};
+	if (params.sampleIssues) query.sampleIssues = Array.isArray(params.sampleIssues) ? params.sampleIssues.join(",") : params.sampleIssues;
+	if (params.sampleLimit != null) query.sampleLimit = params.sampleLimit;
+	return query;
+}
+function dateRangeQuery(params) {
+	return {
+		startDate: params.startDate,
+		endDate: params.endDate
+	};
+}
+function queryTrendQuery(params) {
+	const query = {
+		startDate: params.startDate,
+		endDate: params.endDate,
+		searchType: params.searchType ?? "web"
+	};
+	if (params.prevStartDate) query.prevStartDate = params.prevStartDate;
+	if (params.prevEndDate) query.prevEndDate = params.prevEndDate;
+	return query;
+}
+function pageTrendQuery(params) {
+	const query = {
+		startDate: params.startDate,
+		endDate: params.endDate,
+		searchType: params.searchType ?? "web"
+	};
+	if (params.prevStartDate) query.prevStartDate = params.prevStartDate;
+	if (params.prevEndDate) query.prevEndDate = params.prevEndDate;
+	return query;
+}
 var PartnerApiError = class extends Error {
 	kind;
 	statusCode;
@@ -110,59 +229,6 @@ function createHostedRequester(options, defaults) {
 		shouldValidate: (phase) => shouldValidate(options, phase)
 	};
 }
-const DEFAULT_SEARCH_TYPE$1 = "web";
-function isAnalysisSourcesOptions$1(value) {
-	return !!value && typeof value === "object" && !Array.isArray(value);
-}
-function searchTypeQuery(searchType) {
-	return { searchType: searchType ?? DEFAULT_SEARCH_TYPE$1 };
-}
-function dateRangeOptionsQuery(options) {
-	const query = {};
-	const start = options?.start ?? options?.startDate;
-	const end = options?.end ?? options?.endDate;
-	if (start) query.start = start;
-	if (end) query.end = end;
-	return query;
-}
-function sourceInfoQuery(options) {
-	return {
-		...searchTypeQuery(options?.searchType),
-		...dateRangeOptionsQuery(options)
-	};
-}
-function tablesQuery$1(tablesOrOptions, options) {
-	const tables = isAnalysisSourcesOptions$1(tablesOrOptions) ? tablesOrOptions.tables : tablesOrOptions;
-	const source = isAnalysisSourcesOptions$1(tablesOrOptions) ? tablesOrOptions : options;
-	const query = {
-		...searchTypeQuery(source?.searchType),
-		...dateRangeOptionsQuery(source)
-	};
-	if (tables) query.tables = Array.isArray(tables) ? tables.join(",") : tables;
-	return query;
-}
-function withDefaultSearchType$1(value) {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return value;
-	return {
-		...value,
-		searchType: value.searchType ?? DEFAULT_SEARCH_TYPE$1
-	};
-}
-function indexingUrlsQuery$1(params = {}) {
-	const query = {};
-	if (params.limit != null) query.limit = params.limit;
-	if (params.offset != null) query.offset = params.offset;
-	if (params.status) query.status = params.status;
-	if (params.issue) query.issue = params.issue;
-	if (params.search) query.search = params.search;
-	return query;
-}
-function indexingDiagnosticsQuery$1(params = {}) {
-	const query = {};
-	if (params.sampleIssues) query.sampleIssues = Array.isArray(params.sampleIssues) ? params.sampleIssues.join(",") : params.sampleIssues;
-	if (params.sampleLimit != null) query.sampleLimit = params.sampleLimit;
-	return query;
-}
 function createAnalyticsClient(options = {}) {
 	const { request, shouldValidate } = createHostedRequester(options, { apiBase: "" });
 	return {
@@ -176,18 +242,18 @@ function createAnalyticsClient(options = {}) {
 			return request(analyticsRoutes.site.sourceInfo(siteId), { query: sourceInfoQuery(options) }, analyticsEndpointSchemas.analyticsSourceInfo.response);
 		},
 		getAnalysisSources(siteId, tables, options) {
-			return request(analyticsRoutes.site.analysisSources(siteId), { query: tablesQuery$1(tables, options) }, analyticsEndpointSchemas.analyticsAnalysisSources.response);
+			return request(analyticsRoutes.site.analysisSources(siteId), { query: tablesQuery(tables, options) }, analyticsEndpointSchemas.analyticsAnalysisSources.response);
 		},
 		analyze(siteId, params) {
 			return request(analyticsRoutes.site.analyze(siteId), {
 				method: "POST",
-				body: withDefaultSearchType$1(params)
+				body: withDefaultSearchType(params)
 			});
 		},
 		queryRows(siteId, state) {
 			return request(analyticsRoutes.site.rows(siteId), {
 				method: "POST",
-				body: withDefaultSearchType$1(state)
+				body: withDefaultSearchType(state)
 			}, analyticsEndpointSchemas.analyticsRows.response);
 		},
 		getRollup(siteId, rollupId, params) {
@@ -216,11 +282,11 @@ function createAnalyticsClient(options = {}) {
 			return request(analyticsRoutes.site.inspectionHistory(siteId, hash), {}, analyticsEndpointSchemas.analyticsInspectionHistory.response);
 		},
 		getIndexingUrls(siteId, params = {}) {
-			return request(analyticsRoutes.site.indexingUrls(siteId), { query: indexingUrlsQuery$1(params) }, analyticsEndpointSchemas.analyticsIndexingUrls.response);
+			return request(analyticsRoutes.site.indexingUrls(siteId), { query: indexingUrlsQuery(params) }, analyticsEndpointSchemas.analyticsIndexingUrls.response);
 		},
 		getIndexingDiagnostics(siteId, params = {}) {
 			const parsed = shouldValidate("request") ? analyticsEndpointSchemas.analyticsIndexingDiagnostics.query.parse(params) : params;
-			return request(analyticsRoutes.site.indexingDiagnostics(siteId), { query: indexingDiagnosticsQuery$1(parsed) }, analyticsEndpointSchemas.analyticsIndexingDiagnostics.response);
+			return request(analyticsRoutes.site.indexingDiagnostics(siteId), { query: indexingDiagnosticsQuery(parsed) }, analyticsEndpointSchemas.analyticsIndexingDiagnostics.response);
 		},
 		requestIndexingInspect(siteId, body) {
 			const parsed = shouldValidate("request") ? analyticsEndpointSchemas.analyticsIndexingInspect.body.parse(body) : body;
@@ -337,35 +403,6 @@ function findLifecycleSite(lifecycle, siteIdOrPropertyUrl) {
 	const propertyKey = normalizeGscPropertyKey(siteIdOrPropertyUrl);
 	return lifecycle.sites.find((site) => site.siteId === siteIdOrPropertyUrl || site.externalSiteId === siteIdOrPropertyUrl || !!propertyKey && normalizeGscPropertyKey(site.gscPropertyUrl) === propertyKey || !site.gscPropertyUrl && normalizeLifecycleUrl(site.requestedUrl) === normalized || !propertyKey && normalizeLifecycleUrl(site.requestedUrl) === normalized) ?? null;
 }
-const DEFAULT_SEARCH_TYPE = "web";
-function withDefaultSearchType(state, searchType) {
-	const scoped = state;
-	return {
-		...state,
-		searchType: searchType ?? scoped.searchType ?? DEFAULT_SEARCH_TYPE
-	};
-}
-function dataQuery(state, options) {
-	const opts = options;
-	const scoped = withDefaultSearchType(state, opts?.searchType);
-	const query = {
-		q: JSON.stringify(scoped),
-		searchType: scoped.searchType ?? DEFAULT_SEARCH_TYPE
-	};
-	if (opts?.comparison) query.qc = JSON.stringify(withDefaultSearchType(opts.comparison, scoped.searchType));
-	if (opts?.filter) query.filter = opts.filter;
-	return query;
-}
-function dataDetailQuery(state, options) {
-	const opts = options;
-	const scoped = withDefaultSearchType(state, opts?.searchType);
-	const query = {
-		q: JSON.stringify(scoped),
-		searchType: scoped.searchType ?? DEFAULT_SEARCH_TYPE
-	};
-	if (opts?.comparison) query.qc = JSON.stringify(withDefaultSearchType(opts.comparison, scoped.searchType));
-	return query;
-}
 function validateAnalysisParamsResult(params) {
 	if ((params.preset === "non-brand" || params.preset === "brand-only") && !params.brandTerms?.trim()) return err(new PartnerApiError({
 		kind: "validation",
@@ -377,80 +414,6 @@ function validateAnalysisParamsResult(params) {
 function assertAnalysisParams(params) {
 	unwrapResult(validateAnalysisParamsResult(params), partnerErrorToException);
 }
-function analysisQuery(params) {
-	const query = {
-		preset: params.preset,
-		startDate: params.startDate,
-		endDate: params.endDate
-	};
-	if (params.prevStartDate) query.prevStartDate = params.prevStartDate;
-	if (params.prevEndDate) query.prevEndDate = params.prevEndDate;
-	if (params.brandTerms) query.brandTerms = params.brandTerms;
-	if (params.limit != null) query.limit = params.limit;
-	if (params.offset != null) query.offset = params.offset;
-	if (params.search) query.search = params.search;
-	if (params.minImpressions != null) query.minImpressions = params.minImpressions;
-	if (params.minPosition != null) query.minPosition = params.minPosition;
-	if (params.maxPosition != null) query.maxPosition = params.maxPosition;
-	if (params.maxCtr != null) query.maxCtr = params.maxCtr;
-	query.searchType = params.searchType ?? DEFAULT_SEARCH_TYPE;
-	return query;
-}
-function indexingUrlsQuery(params = {}) {
-	const query = {};
-	if (params.limit != null) query.limit = params.limit;
-	if (params.offset != null) query.offset = params.offset;
-	if (params.status) query.status = params.status;
-	if (params.issue) query.issue = params.issue;
-	if (params.search) query.search = params.search;
-	return query;
-}
-function indexingDiagnosticsQuery(params = {}) {
-	const query = {};
-	if (params.sampleIssues) query.sampleIssues = Array.isArray(params.sampleIssues) ? params.sampleIssues.join(",") : params.sampleIssues;
-	if (params.sampleLimit != null) query.sampleLimit = params.sampleLimit;
-	return query;
-}
-function isAnalysisSourcesOptions(value) {
-	return !!value && typeof value === "object" && !Array.isArray(value);
-}
-function tablesQuery(tablesOrOptions, options) {
-	const tables = isAnalysisSourcesOptions(tablesOrOptions) ? tablesOrOptions.tables : tablesOrOptions;
-	const source = isAnalysisSourcesOptions(tablesOrOptions) ? tablesOrOptions : options;
-	const query = { searchType: source?.searchType ?? DEFAULT_SEARCH_TYPE };
-	const start = source?.start ?? source?.startDate;
-	const end = source?.end ?? source?.endDate;
-	if (start) query.start = start;
-	if (end) query.end = end;
-	if (tables) query.tables = Array.isArray(tables) ? tables.join(",") : tables;
-	return query;
-}
-function dateRangeQuery(params) {
-	return {
-		startDate: params.startDate,
-		endDate: params.endDate
-	};
-}
-function queryTrendQuery(params) {
-	const query = {
-		startDate: params.startDate,
-		endDate: params.endDate,
-		searchType: params.searchType ?? DEFAULT_SEARCH_TYPE
-	};
-	if (params.prevStartDate) query.prevStartDate = params.prevStartDate;
-	if (params.prevEndDate) query.prevEndDate = params.prevEndDate;
-	return query;
-}
-function pageTrendQuery(params) {
-	const query = {
-		startDate: params.startDate,
-		endDate: params.endDate,
-		searchType: params.searchType ?? DEFAULT_SEARCH_TYPE
-	};
-	if (params.prevStartDate) query.prevStartDate = params.prevStartDate;
-	if (params.prevEndDate) query.prevEndDate = params.prevEndDate;
-	return query;
-}
 function sleep(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -663,7 +626,7 @@ function createPartnerClient(options = {}) {
 		getKeywordSparklines(siteId, params) {
 			const withSearchType = {
 				...params,
-				searchType: params.searchType ?? DEFAULT_SEARCH_TYPE
+				searchType: params.searchType ?? "web"
 			};
 			const body = shouldValidate("request") ? partnerEndpointSchemas.getKeywordSparklines.body.parse(withSearchType) : withSearchType;
 			return request(partnerRoutes.sites.keywordSparklines(siteId), {
@@ -1023,7 +986,7 @@ const GSC_COLUMN_OPTIONS = [
 function coerceRowMetrics(row) {
 	return {
 		...row,
-		sum_position: row.sum_position ?? (row.position ?? 0) * row.impressions
+		sum_position: row.sum_position ?? (Math.max(1, row.position ?? 0) - 1) * row.impressions
 	};
 }
 function summarizeDailyRows(raw) {
@@ -1305,7 +1268,7 @@ const CALENDAR_TO_UPSTREAM = {
 	"this-month": "mtd",
 	"this-year": "ytd"
 };
-function fmt$1(d) {
+function fmt(d) {
 	return format(d, "yyyy-MM-dd");
 }
 function buildResultFromIso(start, end) {
@@ -1349,7 +1312,7 @@ function periodToDateRange(period, stableData = true) {
 	}
 	const today = todayInPST();
 	const end = stableData ? subDays(today, 3) : subDays(today, 1);
-	const endIso = fmt$1(end);
+	const endIso = fmt(end);
 	const upstreamPreset = ROLLING_TO_UPSTREAM[period] ?? CALENDAR_TO_UPSTREAM[period];
 	if (upstreamPreset) {
 		const win = resolveWindow({
@@ -1365,14 +1328,14 @@ function periodToDateRange(period, stableData = true) {
 			break;
 		case "last-month": {
 			const prevMonth = subMonths(end, 1);
-			return buildResultFromIso(fmt$1(startOfMonth(prevMonth)), fmt$1(endOfMonth(prevMonth)));
+			return buildResultFromIso(fmt(startOfMonth(prevMonth)), fmt(endOfMonth(prevMonth)));
 		}
 		case "this-quarter":
 			start = startOfQuarter(end);
 			break;
 		default: start = subDays(end, 27);
 	}
-	return buildResultFromIso(fmt$1(start), endIso);
+	return buildResultFromIso(fmt(start), endIso);
 }
 function periodToDays(period) {
 	return periodToDateRange(period).days;
@@ -1576,6 +1539,14 @@ function createPartnerRealtimeClient(options) {
 	};
 }
 const createGscdumpRealtimeClient = createPartnerRealtimeClient;
+function formatSearchConsoleCount(value) {
+	return new Intl.NumberFormat("en").format(Math.max(0, Math.round(value)));
+}
+function countSearchConsoleIssues(issues, ...types) {
+	if (!issues?.length) return 0;
+	const wanted = new Set(types);
+	return issues.reduce((sum, issue) => sum + (wanted.has(issue.type) ? issue.count : 0), 0);
+}
 const KNOWN_SITE_TYPES = /* @__PURE__ */ new Set([
 	"saas",
 	"ecommerce",
@@ -1687,19 +1658,14 @@ function deriveSiteBaseline(rawType, peer = {}) {
 		goalKind: baseline.primaryGoal
 	};
 }
-function formatCount(value) {
-	return new Intl.NumberFormat("en").format(Math.max(0, Math.round(value)));
-}
-function issueCount$1(issues, ...types) {
-	if (!issues?.length) return 0;
-	const wanted = new Set(types);
-	return issues.reduce((sum, issue) => sum + (wanted.has(issue.type) ? issue.count : 0), 0);
-}
 function totalSitemapErrors(sitemaps) {
 	return (sitemaps ?? []).reduce((sum, sitemap) => {
 		return sum + (sitemap.errors ?? 0) + (sitemap.lastError ? 1 : 0);
 	}, 0);
 }
+function signedPct1(value) {
+	return `${value >= 0 ? "+" : ""}${value.toFixed(1)}%`;
+}
 function stage(key, evidence) {
 	return {
 		key,
@@ -1841,11 +1807,11 @@ function classifySearchConsoleStage(input) {
 		source: "indexing"
 	}]);
 	const sitemapErrors = totalSitemapErrors(sitemaps);
-	const unknown = issueCount$1(issues, "unknown_to_google");
-	const discovered = issueCount$1(issues, "discovered_not_indexed");
-	const crawled = issueCount$1(issues, "crawled_not_indexed");
-	const hardBlocks = issueCount$1(issues, "blocked_robots", "server_error", "access_denied", "forbidden") + (input.crawlAuditBlockerCount ?? 0);
-	const canonicalMismatches = Math.min(notIndexed, input.canonicalMismatchCount ?? issueCount$1(issues, "canonical_mismatch"));
+	const unknown = countSearchConsoleIssues(issues, "unknown_to_google");
+	const discovered = countSearchConsoleIssues(issues, "discovered_not_indexed");
+	const crawled = countSearchConsoleIssues(issues, "crawled_not_indexed");
+	const hardBlocks = countSearchConsoleIssues(issues, "blocked_robots", "server_error", "access_denied", "forbidden") + (input.crawlAuditBlockerCount ?? 0);
+	const canonicalMismatches = Math.min(notIndexed, input.canonicalMismatchCount ?? countSearchConsoleIssues(issues, "canonical_mismatch"));
 	const visibleNoClickPages = (input.pageInventory ?? []).filter((page) => page.impressions >= 50 && page.clicks === 0).length;
 	const poorPositionPages = (input.pageInventory ?? []).filter((page) => page.impressions >= 50 && (page.position ?? 0) > 20).length;
 	const ctrOutlierCount = input.ctrOutlierCount ?? 0;
@@ -1862,11 +1828,11 @@ function classifySearchConsoleStage(input) {
 	const isEstablished = impressions28d != null && impressions28d >= ESTABLISHED_IMPRESSIONS_28D$1;
 	if (hardBlocks > Math.max(10, totalUrls * .05)) return stage("crawl_blocked", [{
 		label: "Crawl / on-page faults",
-		value: formatCount(hardBlocks),
+		value: formatSearchConsoleCount(hardBlocks),
 		source: "indexing"
 	}, {
 		label: "Indexed pages",
-		value: `${formatCount(indexed)} of ${formatCount(totalUrls)}`,
+		value: `${formatSearchConsoleCount(indexed)} of ${formatSearchConsoleCount(totalUrls)}`,
 		source: "indexing"
 	}]);
 	if (isDeclining) return stage("declining_visibility", [{
@@ -1881,60 +1847,60 @@ function classifySearchConsoleStage(input) {
 	if (isGrowing) return stage("healthy_growth_ready", [
 		...hardBlocks > 0 ? [{
 			label: "Critical blockers",
-			value: formatCount(hardBlocks),
+			value: formatSearchConsoleCount(hardBlocks),
 			source: "indexing"
 		}] : [],
 		...clicks90d != null ? [{
 			label: "Clicks 90d",
-			value: `+${clicks90d.toFixed(1)}%`,
+			value: signedPct1(clicks90d),
 			source: "performance"
 		}] : [],
 		...imp90d != null ? [{
 			label: "Impressions 90d",
-			value: `+${imp90d.toFixed(1)}%`,
+			value: signedPct1(imp90d),
 			source: "performance"
 		}] : [],
 		...(input.recoverableBacklinkCount ?? 0) > 0 ? [{
 			label: "Recoverable backlinks",
-			value: formatCount(input.recoverableBacklinkCount),
+			value: formatSearchConsoleCount(input.recoverableBacklinkCount),
 			source: "performance"
 		}] : [],
 		...(input.competitorGapCount ?? 0) > 0 ? [{
 			label: "Competitor content gaps",
-			value: formatCount(input.competitorGapCount),
+			value: formatSearchConsoleCount(input.competitorGapCount),
 			source: "performance"
 		}] : []
 	]);
 	if (crawled > Math.max(10, totalUrls * .3) && totalUrls > 500) return stage("index_rejection", [{
 		label: "Crawled, not indexed",
-		value: formatCount(crawled),
+		value: formatSearchConsoleCount(crawled),
 		source: "indexing"
 	}, {
 		label: "Not indexed",
-		value: formatCount(notIndexed),
+		value: formatSearchConsoleCount(notIndexed),
 		source: "indexing"
 	}]);
 	if (isNascent) return stage("waiting_for_data", [{
 		label: "Impressions (28d)",
-		value: formatCount(impressions28d ?? 0),
+		value: formatSearchConsoleCount(impressions28d ?? 0),
 		source: "performance"
 	}, {
 		label: "Indexed pages",
-		value: `${formatCount(indexed)} of ${formatCount(totalUrls)}`,
+		value: `${formatSearchConsoleCount(indexed)} of ${formatSearchConsoleCount(totalUrls)}`,
 		source: "indexing"
 	}]);
 	if (!isEstablished && (sitemaps.length === 0 || sitemapErrors > 0 || unknown > Math.max(5, totalUrls * .1))) return stage("weak_discovery", [{
 		label: "Sitemaps",
-		value: sitemaps.length === 0 ? "None registered" : `${formatCount(sitemapErrors)} errors`,
+		value: sitemaps.length === 0 ? "None registered" : `${formatSearchConsoleCount(sitemapErrors)} errors`,
 		source: "sitemap"
 	}, ...unknown > 0 ? [{
 		label: "Unknown URLs",
-		value: formatCount(unknown),
+		value: formatSearchConsoleCount(unknown),
 		source: "indexing"
 	}] : []]);
 	if (discovered > Math.max(10, totalUrls * .15)) return stage("discovery_backlog", [{
 		label: "Discovered, not crawled",
-		value: formatCount(discovered),
+		value: formatSearchConsoleCount(discovered),
 		source: "indexing"
 	}, {
 		label: "Indexed pages",
@@ -1943,7 +1909,7 @@ function classifySearchConsoleStage(input) {
 	}]);
 	if (canonicalMismatches > Math.max(5, totalUrls * .05)) return stage("indexability_blocked", [{
 		label: "Canonical mismatches",
-		value: formatCount(canonicalMismatches),
+		value: formatSearchConsoleCount(canonicalMismatches),
 		source: "canonical"
 	}]);
 	const lowCtrType = siteTypeBaseline(input.siteType).ctrExpectation === "low";
@@ -1951,16 +1917,16 @@ function classifySearchConsoleStage(input) {
 	const noClickTrigger = visibleNoClickPages >= Math.max(1, (input.pageInventory?.length ?? 0) * noClickShare);
 	if (ctrOutlierCount > 0 && !lowCtrType || noClickTrigger) return stage("visible_not_clicked", [...ctrOutlierCount > 0 ? [{
 		label: "CTR outliers",
-		value: formatCount(ctrOutlierCount),
+		value: formatSearchConsoleCount(ctrOutlierCount),
 		source: "performance"
 	}] : [], ...visibleNoClickPages > 0 ? [{
 		label: "Visible, no clicks",
-		value: formatCount(visibleNoClickPages),
+		value: formatSearchConsoleCount(visibleNoClickPages),
 		source: "performance"
 	}] : []]);
 	if (poorPositionPages >= Math.max(1, (input.pageInventory?.length ?? 0) * .25)) return stage("ranking_stalled", [{
 		label: "Low-ranking visible pages",
-		value: formatCount(poorPositionPages),
+		value: formatSearchConsoleCount(poorPositionPages),
 		source: "performance"
 	}]);
 	return stage("healthy_growth_ready", [{
@@ -1969,7 +1935,7 @@ function classifySearchConsoleStage(input) {
 		source: "indexing"
 	}, {
 		label: "Critical blockers",
-		value: formatCount(hardBlocks),
+		value: formatSearchConsoleCount(hardBlocks),
 		source: "indexing"
 	}]);
 }
@@ -2001,14 +1967,6 @@ function reachLivenessRatio(daily) {
 	for (let i = 6; i < series.length; i++) peakWeek = Math.max(peakWeek, rolling7(i));
 	return peakWeek > 0 ? latestWeek / peakWeek : null;
 }
-function issueCount(issues, ...types) {
-	if (!issues?.length) return 0;
-	const wanted = new Set(types);
-	return issues.reduce((sum, i) => sum + (wanted.has(i.type) ? i.count : 0), 0);
-}
-function fmt(n) {
-	return new Intl.NumberFormat("en").format(Math.max(0, Math.round(n)));
-}
 function clamp01(n) {
 	if (!Number.isFinite(n)) return 0;
 	return Math.min(1, Math.max(0, n));
@@ -2083,11 +2041,11 @@ function isIntentionalRetirementSite(input, notFound, serverError) {
 function classifyHealthStage(input) {
 	const issues = input.issues ?? [];
 	const totalUrls = input.totalUrls ?? 0;
-	const noindex = issueCount(issues, "noindex");
-	const notFound = issueCount(issues, "not_found");
-	const softFound = issueCount(issues, "soft_404");
-	const serverError = issueCount(issues, "server_error", "blocked_robots", "access_denied", "forbidden");
-	const crawledNotIndexed = issueCount(issues, "crawled_not_indexed");
+	const noindex = countSearchConsoleIssues(issues, "noindex");
+	const notFound = countSearchConsoleIssues(issues, "not_found");
+	const softFound = countSearchConsoleIssues(issues, "soft_404");
+	const serverError = countSearchConsoleIssues(issues, "server_error", "blocked_robots", "access_denied", "forbidden");
+	const crawledNotIndexed = countSearchConsoleIssues(issues, "crawled_not_indexed");
 	const intentionalDead = isIntentionalRetirementSite(input, notFound, serverError) ? notFound : 0;
 	const indexableUrls = Math.max(1, totalUrls - noindex - intentionalDead);
 	const hardBlocks = serverError + (input.crawlAuditBlockerCount ?? 0);
@@ -2099,9 +2057,9 @@ function classifyHealthStage(input) {
 			...HEALTH_COPY.crawl_faults,
 			evidence: [{
 				label: "Access faults (5xx / broken)",
-				value: fmt(hardBlocks)
+				value: formatSearchConsoleCount(hardBlocks)
 			}],
-			progression: escapeReduce("healthy", "access faults", hardBlocks, faultTarget, `${fmt(hardBlocks)} faults — fix ~${fmt(toFix)} to clear the gate`)
+			progression: escapeReduce("healthy", "access faults", hardBlocks, faultTarget, `${formatSearchConsoleCount(hardBlocks)} faults — fix ~${formatSearchConsoleCount(toFix)} to clear the gate`)
 		};
 	}
 	const rejectPool = crawledNotIndexed + softFound;
@@ -2113,12 +2071,12 @@ function classifyHealthStage(input) {
 			...HEALTH_COPY.quality_rejection,
 			evidence: [{
 				label: "Crawled, then refused",
-				value: fmt(rejectPool)
+				value: formatSearchConsoleCount(rejectPool)
 			}, {
 				label: "Share of known URLs",
 				value: `${(share * 100).toFixed(0)}%`
 			}],
-			progression: escapeReduce("healthy", "crawled-rejected share", share, REJECT_SHARE, `${(share * 100).toFixed(0)}% rejected — improve/consolidate ~${fmt(toClear)} pages to clear`)
+			progression: escapeReduce("healthy", "crawled-rejected share", share, REJECT_SHARE, `${(share * 100).toFixed(0)}% rejected — improve/consolidate ~${formatSearchConsoleCount(toClear)} pages to clear`)
 		};
 	}
 	return {
@@ -2178,8 +2136,8 @@ function classifyReachStage(input) {
 	const liveness = input.livenessRatio ?? null;
 	if (imp12m != null && imp12m < LIFETIME_FLOOR) return reach("waiting_for_data", [{
 		label: "Impressions (12m)",
-		value: fmt(imp12m)
-	}], advance("emerging", "lifetime impressions", imp12m, LIFETIME_FLOOR, `${fmt(imp12m)} of ${fmt(LIFETIME_FLOOR)} lifetime impressions — collecting data, keep indexing`));
+		value: formatSearchConsoleCount(imp12m)
+	}], advance("emerging", "lifetime impressions", imp12m, LIFETIME_FLOOR, `${formatSearchConsoleCount(imp12m)} of ${formatSearchConsoleCount(LIFETIME_FLOOR)} lifetime impressions — collecting data, keep indexing`));
 	const hadRealReach = (imp12m ?? imp28d) > LIFETIME_FLOOR;
 	const isGrowing = clicks90dPct != null && clicks90dPct > GROWTH_CLICKS_PCT || imp90dPct != null && imp90dPct > GROWTH_IMPRESSIONS_PCT && posDelta != null && posDelta < 0;
 	if (hadRealReach && liveness != null && liveness < FADED_LIVENESS && !isGrowing) return reach("faded", [{
@@ -2202,38 +2160,40 @@ function classifyReachStage(input) {
 		direction: "escape"
 	});
 	if (isGrowing) {
-		const growthPct = clicks90dPct ?? imp90dPct ?? 0;
-		const growthLabel = clicks90dPct != null ? `${pctStr(clicks90dPct)} 90d clicks — comfortably growing; defend & expand` : `${pctStr(growthPct)} 90d impressions — comfortably growing; defend & expand`;
+		const clickGrowth = clicks90dPct != null && clicks90dPct > GROWTH_CLICKS_PCT;
+		const growthPct = clickGrowth ? clicks90dPct : imp90dPct ?? clicks90dPct ?? 0;
+		const growthMetric = clickGrowth ? "90d clicks growth" : "90d impressions growth";
+		const growthLabel = clickGrowth ? `${pctStr(clicks90dPct)} 90d clicks — comfortably growing; defend & expand` : `${pctStr(growthPct)} 90d impressions — comfortably growing; defend & expand`;
 		return reach("growing", [...clicks90dPct != null ? [{
 			label: "Clicks 90d",
-			value: `+${clicks90dPct.toFixed(0)}%`
+			value: pctStr(clicks90dPct)
 		}] : [], ...imp90dPct != null ? [{
 			label: "Impressions 90d",
-			value: `+${imp90dPct.toFixed(0)}%`
-		}] : []], sustain("90d clicks growth", growthPct, growthLabel));
+			value: pctStr(imp90dPct)
+		}] : []], sustain(growthMetric, growthPct, growthLabel));
 	}
 	const ctr = clicks28d != null && imp28d > 0 ? clicks28d / imp28d : null;
 	if (hadRealReach && imp28d >= NASCENT_IMPRESSIONS_28D && ctr != null && ctr < DECAY_CTR) return reach("decayed", [{
 		label: "Impressions (28d)",
-		value: fmt(imp28d)
+		value: formatSearchConsoleCount(imp28d)
 	}, {
 		label: "Clicks (28d)",
-		value: fmt(clicks28d ?? 0)
-	}], escapeToward("growing", "CTR (clicks/impressions)", ctr, DECAY_CTR, `${(ctr * 100).toFixed(2)}% CTR on ${fmt(imp28d)} impressions — refresh content toward ~${(DECAY_CTR * 100).toFixed(1)}%`));
+		value: formatSearchConsoleCount(clicks28d ?? 0)
+	}], escapeToward("growing", "CTR (clicks/impressions)", ctr, DECAY_CTR, `${(ctr * 100).toFixed(2)}% CTR on ${formatSearchConsoleCount(imp28d)} impressions — refresh content toward ~${(DECAY_CTR * 100).toFixed(1)}%`));
 	const growthVal = clicks90dPct ?? 0;
 	const growthGap = Math.max(0, GROWTH_CLICKS_PCT - growthVal);
 	const growthProgression = (stage) => advance("growing", "90d clicks growth", growthVal, GROWTH_CLICKS_PCT, clicks90dPct != null ? `${pctStr(growthVal)} 90d clicks — need ${pctStr(growthGap)} more to clear the +${GROWTH_CLICKS_PCT}% growth bar` : `${stage === "plateaued" ? "flat" : "rising"} — reach +${GROWTH_CLICKS_PCT}% 90d clicks growth to break into growing`);
 	if (imp28d >= ESTABLISHED_IMPRESSIONS_28D) return reach("plateaued", [{
 		label: "Impressions (28d)",
-		value: fmt(imp28d)
+		value: formatSearchConsoleCount(imp28d)
 	}], growthProgression("plateaued"));
 	if (imp28d < NASCENT_IMPRESSIONS_28D) return reach("emerging", [{
 		label: "Impressions (28d)",
-		value: fmt(imp28d)
+		value: formatSearchConsoleCount(imp28d)
 	}], growthProgression("emerging"));
 	return reach("plateaued", [{
 		label: "Impressions (28d)",
-		value: fmt(imp28d)
+		value: formatSearchConsoleCount(imp28d)
 	}], growthProgression("plateaued"));
 }
 function classifySiteTriage(input) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/sdk",
   "type": "module",
-  "version": "0.33.0",
+  "version": "0.33.3",
   "description": "Consumer SDK for hosted gscdump.com integrations.",
   "author": {
     "name": "Harlan Wilton",
@@ -44,10 +44,10 @@
     "date-fns": "^4.4.0",
     "ofetch": "^1.5.1",
     "zod": "^4.4.3",
-    "@gscdump/contracts": "0.33.0",
-    "@gscdump/engine": "0.33.0",
-    "gscdump": "0.33.0",
-    "@gscdump/analysis": "0.33.0"
+    "@gscdump/analysis": "0.33.3",
+    "@gscdump/contracts": "0.33.3",
+    "@gscdump/engine": "0.33.3",
+    "gscdump": "0.33.3"
   },
   "devDependencies": {
     "typescript": "^6.0.3",