@gscdump/cli 5.4.0 → 5.7.0

package/dist/commands/auth.mjs

@@ -3,7 +3,7 @@ import { clearAuthentication, formatHostedSync, getHostedAccount, noSitesNextSte
 import { authCommandMeta } from "../command-meta.mjs";
 import { loadConfig, saveConfig } from "../config.mjs";
 import { OUTPUT_ARGS, applyOutputMode, logger } from "../utils.mjs";
-import { ACCESS_NOT_SET_UP, clearTokens, formatAuthProvenance, getAuth, loadServiceAccount, loadTokens, resolveBYOK, saveTokens } from "../auth.mjs";
+import { ACCESS_NOT_SET_UP, clearTokens, formatAuthProvenance, getAuth, isStaleServiceAccountPointer, loadServiceAccount, loadTokens, resolveBYOK, resolveServiceAccount, saveTokens } from "../auth.mjs";
 import { missingRequiredScopes } from "../auth-scopes.mjs";
 import { clearBingCredentials, getBingClient, inspectBingCredentials } from "../bing-auth.mjs";
 import { loginWithHostedSession } from "../hosted-auth.mjs";
@@ -92,8 +92,9 @@ async function loginHosted(args) {
 }
 async function resolveLiveAuthState() {
 	const tokens = await loadTokens();
-	const byok = resolveBYOK();
-	const source = byok ?? (tokens ? await getAuth({ interactive: false }).catch((error) => error instanceof Error ? error : new Error(String(error))) : null);
+	const serviceAccount = await resolveServiceAccount().catch((error) => isStaleServiceAccountPointer(error) ? null : error instanceof Error ? error : new Error(String(error)));
+	const byok = serviceAccount ? null : resolveBYOK();
+	const source = serviceAccount ?? byok ?? (tokens ? await getAuth({ interactive: false }).catch((error) => error instanceof Error ? error : new Error(String(error))) : null);
 	const current = source === null ? null : source instanceof Error ? {
 		kind: "failed",
 		detail: redactTokens(source.message)
@@ -105,6 +106,7 @@ async function resolveLiveAuthState() {
 	const scopes = tokenInfo?.scope ? tokenInfo.scope.split(/\s+/).filter(Boolean) : [];
 	const missing = missingRequiredScopes(scopes);
 	return {
+		serviceAccount,
 		byok,
 		tokens: tokens && !byok ? await loadTokens() : tokens,
 		liveToken,
@@ -170,7 +172,7 @@ async function runStatus(args) {
 		}
 		return;
 	}
-	const { byok, tokens, tokenInfo, failure, scopes, missing } = await resolveLiveAuthState();
+	const { serviceAccount, byok, tokens, tokenInfo, failure, scopes, missing } = await resolveLiveAuthState();
 	const googleAuthenticated = tokenInfo !== null;
 	const bingCredentials = await inspectBingCredentials();
 	const bingResult = bingCredentials._tag === "Missing" ? null : await getBingClient().then((client) => client.getUserSites({ signal: AbortSignal.timeout(1e4) })).catch(() => null);
@@ -187,7 +189,7 @@ async function runStatus(args) {
 			googleAuthenticated,
 			googleError: failure,
 			bing,
-			source: byok ? "env" : tokens ? "saved-tokens" : null,
+			source: serviceAccount ? "service-account" : byok ? "env" : tokens ? "saved-tokens" : null,
 			envCredential: byokKind,
 			scopes,
 			tokenAccount: tokenInfo?.email ?? null,
@@ -212,6 +214,13 @@ async function runStatus(args) {
 			console.log(`  \x1B[90mRun \`gscdump auth login --force\` to re-consent.\x1B[0m`);
 		}
 	};
+	if (serviceAccount) {
+		if (googleAuthenticated) logger.success("Authenticated (service account)");
+		else logger.warn(`Service-account credentials failed verification: ${failure}`);
+		if (tokenInfo?.email) console.log(`  Account:       ${tokenInfo.email}`);
+		reportScopes();
+		return;
+	}
 	if (byok) {
 		if (googleAuthenticated) logger.success(`Authenticated with environment credentials (${byokKind})`);
 		else logger.warn(`Environment credentials (${byokKind}) failed verification: ${failure}`);

package/dist/package.mjs

@@ -1,2 +1,2 @@
-var version = "5.4.0";
+var version = "5.7.0";
 export { version };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cli",
   "type": "module",
-  "version": "5.4.0",
+  "version": "5.7.0",
   "description": "CLI for Google Search Console and Bing with hosted or local authentication, data exports, and an MCP server",
   "author": {
     "name": "Harlan Wilton",
@@ -44,16 +44,16 @@
   "dependencies": {
     "@clack/prompts": "^1.8.1",
     "@duckdb/node-api": "1.5.5-r.5",
-    "@gscdump/analysis": "^5.3.0",
-    "@gscdump/contracts": "^5.3.0",
-    "@gscdump/engine": "^5.3.0",
-    "@gscdump/engine-gsc-api": "^5.3.0",
-    "@gscdump/sdk": "^5.3.1",
+    "@gscdump/analysis": "^5.7.0",
+    "@gscdump/contracts": "^5.7.0",
+    "@gscdump/engine": "^5.7.0",
+    "@gscdump/engine-gsc-api": "^5.7.0",
+    "@gscdump/sdk": "^5.7.0",
     "@modelcontextprotocol/sdk": "^1.30.1",
     "citty": "^0.2.2",
     "consola": "^3.4.2",
     "google-auth-library": "^11.1.0",
-    "gscdump": "^5.3.1",
+    "gscdump": "^5.7.0",
     "ofetch": "^1.5.1",
     "open": "^11.0.4",
     "proper-lockfile": "^4.1.2",