@gscdump/cli 0.32.12 → 0.33.3

package/dist/index.mjs

@@ -10,7 +10,7 @@ import { err, ok, unwrapResult } from "gscdump/result";
 import { decodeSiteId, normalizeSiteUrl } from "gscdump/tenant";
 import os from "node:os";
 import { cancel, confirm, isCancel, multiselect, select, text } from "@clack/prompts";
-import { addSite, batchInspectUrls, batchRequestIndexing, createAuth, deleteSite, discoverSitemap, fetchSitemap, fetchSitemapUrls, fetchSitesWithSitemaps, formatErrorForCli, getIndexingMetadata, getVerificationToken, getVerifiedSite, googleSearchConsole, listVerifiedSites, requestIndexing, runSequentialBatch, siteUrlToVerificationSite, unverifySite, verificationMethodsFor, verifySite } from "gscdump/api";
+import { addSite, batchInspectUrls, batchRequestIndexing, createAuth, deleteSite, discoverSitemap, fetchSitemap, fetchSitemapUrls, fetchSitesWithSitemaps, formatErrorForCli, getIndexingMetadata, getVerificationToken, getVerifiedSite, googleSearchConsole, hasGscWriteScope, hasIndexingScope, listVerifiedSites, requestIndexing, runSequentialBatch, siteUrlToVerificationSite, unverifySite, verificationMethodsFor, verifySite } from "gscdump/api";
 import { createServer } from "node:http";
 import { JWT, OAuth2Client } from "google-auth-library";
 import { ofetch } from "ofetch";
@@ -136,7 +136,7 @@ function loadEnvFromCwd() {
 	}
 	return applied;
 }
-var version = "0.32.12";
+var version = "0.33.3";
 const ALL_SEARCH_TYPES$1 = Object.values(SearchTypes);
 const VERSION = version;
 function noSubcommandSelected(parent, subNames) {
@@ -1769,6 +1769,17 @@ const REQUIRED_SCOPES$2 = [
 	"https://www.googleapis.com/auth/indexing",
 	"https://www.googleapis.com/auth/siteverification"
 ];
+function hasGoogleScope$2(scopes, scope) {
+	const suffix = scope.replace("https://www.googleapis.com/auth/", "");
+	return scopes.includes(scope) || scopes.includes(suffix);
+}
+function missingRequiredScopes$2(scopes) {
+	return REQUIRED_SCOPES$2.filter((scope) => {
+		if (scope.endsWith("/webmasters")) return !hasGscWriteScope(scopes);
+		if (scope.endsWith("/indexing")) return !hasIndexingScope(scopes);
+		return !hasGoogleScope$2(scopes, scope);
+	});
+}
 async function fetchTokenInfo(accessToken) {
 	return ofetch("https://oauth2.googleapis.com/tokeninfo", { query: { access_token: accessToken } }).catch(() => null);
 }
@@ -1781,8 +1792,7 @@ async function resolveLiveAuthState() {
 	else if (tokens?.access_token) liveToken = tokens.access_token;
 	const tokenInfo = liveToken ? await fetchTokenInfo(liveToken) : null;
 	const scopes = tokenInfo?.scope ? tokenInfo.scope.split(/\s+/).filter(Boolean) : [];
-	const has = (s) => scopes.includes(s) || scopes.includes(s.replace(".readonly", ""));
-	const missing = REQUIRED_SCOPES$2.filter((s) => !has(s));
+	const missing = missingRequiredScopes$2(scopes);
 	return {
 		byok,
 		tokens,
@@ -2277,6 +2287,17 @@ function redact(v) {
 	if (v.length <= 6) return "***";
 	return `***${v.slice(-6)}`;
 }
+function hasGoogleScope$1(scopes, scope) {
+	const suffix = scope.replace("https://www.googleapis.com/auth/", "");
+	return scopes.includes(scope) || scopes.includes(suffix);
+}
+function missingRequiredScopes$1(scopes) {
+	return REQUIRED_SCOPES$1.filter((scope) => {
+		if (scope.endsWith("/webmasters")) return !hasGscWriteScope(scopes);
+		if (scope.endsWith("/indexing")) return !hasIndexingScope(scopes);
+		return !hasGoogleScope$1(scopes, scope);
+	});
+}
 async function checkEnv() {
 	const envPath = path.join(process.cwd(), ".env");
 	const parsed = parseEnvFile(envPath);
@@ -2384,7 +2405,7 @@ async function checkAuth$1(envKeys) {
 		detail: info.email
 	});
 	const scopes = info.scope ? info.scope.split(/\s+/) : [];
-	const missing = REQUIRED_SCOPES$1.filter((s) => !scopes.includes(s) && !scopes.includes(s.replace(".readonly", "")));
+	const missing = missingRequiredScopes$1(scopes);
 	if (missing.length > 0) checks.push({
 		name: "auth.scopes",
 		status: "warn",
@@ -3740,6 +3761,17 @@ const REQUIRED_SCOPES = [
 ];
 const FETCH_TIMEOUT_MS = 5e3;
 const TIME_SKEW_WARN_MS = 5 * 6e4;
+function hasGoogleScope(scopes, scope) {
+	const suffix = scope.replace("https://www.googleapis.com/auth/", "");
+	return scopes.includes(scope) || scopes.includes(suffix);
+}
+function missingRequiredScopes(scopes) {
+	return REQUIRED_SCOPES.filter((scope) => {
+		if (scope.endsWith("/webmasters")) return !hasGscWriteScope(scopes);
+		if (scope.endsWith("/indexing")) return !hasIndexingScope(scopes);
+		return !hasGoogleScope(scopes, scope);
+	});
+}
 async function diagnostics(_input, ctx) {
 	const checks = [];
 	const token = await resolveAccessToken(ctx.auth);
@@ -3773,7 +3805,7 @@ async function diagnostics(_input, ctx) {
 			detail: tokenInfo.email ?? "token valid"
 		});
 		const scopes = tokenInfo.scope ? tokenInfo.scope.split(/\s+/) : [];
-		const missing = REQUIRED_SCOPES.filter((s) => !scopes.includes(s));
+		const missing = missingRequiredScopes(scopes);
 		checks.push(missing.length > 0 ? {
 			name: "auth.scopes",
 			status: "warn",
@@ -4114,6 +4146,50 @@ const runReportInput = z.object({
 	prevEnd: z.string().optional().describe("Override comparison-window end."),
 	maxFindings: z.number().optional().describe("Cap findings per section (per-report default ~5).")
 });
+async function runMcpSearchAnalyticsQuery(client, args) {
+	const totalLimit = Math.max(0, args.rowLimit ?? 25e3);
+	const pageSize = Math.min(totalLimit, 25e3);
+	const allRows = [];
+	let startRow = 0;
+	while (allRows.length < totalLimit) {
+		const remaining = totalLimit - allRows.length;
+		const currentLimit = Math.min(pageSize, remaining);
+		if (currentLimit <= 0) break;
+		const rows = ((await client._rawQuery(args.siteUrl, {
+			startDate: args.startDate,
+			endDate: args.endDate,
+			dimensions: args.dimensions,
+			rowLimit: currentLimit,
+			startRow,
+			...args.type ? { type: args.type } : {},
+			...args.dataState ? { dataState: args.dataState } : {},
+			...args.aggregationType ? { aggregationType: args.aggregationType } : {},
+			...args.dimensionFilterGroups ? { dimensionFilterGroups: args.dimensionFilterGroups.map((g) => ({
+				groupType: g.groupType ?? "and",
+				filters: g.filters
+			})) } : {}
+		})).rows || []).map((row) => {
+			const result = {
+				clicks: row.clicks ?? 0,
+				impressions: row.impressions ?? 0,
+				ctr: row.ctr ?? 0,
+				position: row.position ?? 0
+			};
+			args.dimensions.forEach((dim, i) => {
+				result[dim] = row.keys?.[i];
+			});
+			return result;
+		});
+		if (rows.length === 0) break;
+		allRows.push(...rows);
+		startRow += rows.length;
+	}
+	return {
+		siteUrl: args.siteUrl,
+		rowCount: allRows.length,
+		rows: allRows
+	};
+}
 function createGscMcpServer(options) {
 	const { name = "gscdump", version = "1.0.0", getAuth } = options;
 	const server = new McpServer({
@@ -4264,47 +4340,20 @@ function createGscMcpServer(options) {
 			dimensionFilterGroups: z.array(filterGroupSchema).optional().describe("Filter groups (each \"and\"-ed internally; multiple groups are OR-ed)")
 		}).shape
 	}, async ({ siteUrl, startDate, endDate, dimensions, rowLimit, type, dataState, aggregationType, dimensionFilterGroups }) => {
-		const client = await getClient();
-		const limit = rowLimit ?? 25e3;
-		const allRows = [];
-		let startRow = 0;
-		while (true) {
-			const rows = ((await client._rawQuery(siteUrl, {
-				startDate,
-				endDate,
-				dimensions,
-				rowLimit: limit,
-				startRow,
-				...type ? { type } : {},
-				...dataState ? { dataState } : {},
-				...aggregationType ? { aggregationType } : {},
-				...dimensionFilterGroups ? { dimensionFilterGroups: dimensionFilterGroups.map((g) => ({
-					groupType: g.groupType ?? "and",
-					filters: g.filters
-				})) } : {}
-			})).rows || []).map((row) => {
-				const result = {
-					clicks: row.clicks ?? 0,
-					impressions: row.impressions ?? 0,
-					ctr: row.ctr ?? 0,
-					position: row.position ?? 0
-				};
-				dimensions.forEach((dim, i) => {
-					result[dim] = row.keys?.[i];
-				});
-				return result;
-			});
-			allRows.push(...rows);
-			if (rows.length < limit) break;
-			startRow += rows.length;
-		}
+		const result = await runMcpSearchAnalyticsQuery(await getClient(), {
+			siteUrl,
+			startDate,
+			endDate,
+			dimensions,
+			rowLimit,
+			type,
+			dataState,
+			aggregationType,
+			dimensionFilterGroups
+		});
 		return { content: [{
 			type: "text",
-			text: JSON.stringify({
-				siteUrl,
-				rowCount: allRows.length,
-				rows: allRows
-			}, null, 2)
+			text: JSON.stringify(result, null, 2)
 		}] };
 	});
 	server.registerTool("inspect-url", {
@@ -4505,6 +4554,7 @@ function createGscMcpServer(options) {
 	return server;
 }
 async function checkAuth() {
+	if (await resolveServiceAccount().then(Boolean).catch(() => false)) return { ok: true };
 	if (resolveBYOK()) return { ok: true };
 	const config = await loadConfig();
 	if (!config.clientId && !config.clientSecret) return {
@@ -4546,7 +4596,7 @@ const mcpCommand = defineCommand({
 		const server = createGscMcpServer({
 			name: "gscdump",
 			version: VERSION,
-			getAuth: () => getAuth({ interactive: false })
+			getAuth: () => resolveAuth({ interactive: false })
 		});
 		const transport = new StdioServerTransport();
 		await server.connect(transport);
@@ -4616,12 +4666,13 @@ function makeLeaf(col, operator, value) {
 }
 async function runLiveQuery(client, siteUrl, opts) {
 	const allRows = [];
+	const totalLimit = Math.max(0, opts.rowLimit);
+	const pageSize = Math.min(totalLimit, 25e3);
 	let startRow = 0;
 	const baseBody = {
 		startDate: opts.startDate,
 		endDate: opts.endDate,
-		dimensions: opts.dimensions,
-		rowLimit: opts.rowLimit
+		dimensions: opts.dimensions
 	};
 	if (opts.searchType) baseBody.type = opts.searchType;
 	if (opts.dataState) baseBody.dataState = opts.dataState;
@@ -4630,9 +4681,13 @@ async function runLiveQuery(client, siteUrl, opts) {
 		const groups = filterToGroups(opts.dimensionFilter);
 		if (groups.length > 0) baseBody.dimensionFilterGroups = groups;
 	}
-	while (true) {
+	while (allRows.length < totalLimit) {
+		const remaining = totalLimit - allRows.length;
+		const rowLimit = Math.min(pageSize, remaining);
+		if (rowLimit <= 0) break;
 		const rows = ((await client._rawQuery(siteUrl, {
 			...baseBody,
+			rowLimit,
 			startRow
 		})).rows || []).map((row) => {
 			const result = {
@@ -4646,8 +4701,8 @@ async function runLiveQuery(client, siteUrl, opts) {
 			});
 			return result;
 		});
+		if (rows.length === 0) break;
 		allRows.push(...rows);
-		if (rows.length < opts.rowLimit) break;
 		startRow += rows.length;
 	}
 	return { rows: allRows };
@@ -6829,7 +6884,7 @@ async function runOneDate(store, client, siteUrl, table, searchType, dims, date)
 			});
 			if (transformed) rows.push(transformed.row);
 		}
-		if (batch.length < rowLimit) break;
+		if (batch.length === 0) break;
 		startRow += batch.length;
 	}
 	const writeCtx = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cli",
   "type": "module",
-  "version": "0.32.12",
+  "version": "0.33.3",
   "description": "CLI for Google Search Console - dump, query, and run MCP server",
   "author": {
     "name": "Harlan Wilton",
@@ -43,10 +43,10 @@
     "ofetch": "^1.5.1",
     "open": "^11.0.0",
     "zod": "^4.4.3",
-    "@gscdump/engine": "0.32.12",
-    "@gscdump/engine-gsc-api": "0.32.12",
-    "gscdump": "0.32.12",
-    "@gscdump/analysis": "0.32.12"
+    "@gscdump/analysis": "0.33.3",
+    "@gscdump/engine-gsc-api": "0.33.3",
+    "gscdump": "0.33.3",
+    "@gscdump/engine": "0.33.3"
   },
   "devDependencies": {
     "@duckdb/node-api": "1.5.1-r.2",