@gscdump/cli 3.7.0 → 4.0.0

package/dist/commands/inspect.mjs

@@ -1,11 +1,11 @@
 import { inspectCommandMeta } from "../command-meta.mjs";
-import { OUTPUT_ARGS, applyOutputMode, logger, parseIntegerOption, readUrlList } from "../utils.mjs";
+import { OUTPUT_ARGS, applyOutputMode, dim, logger, readUrlList, red } from "../utils.mjs";
+import { formatSiteIdCollision, recordStoreSite } from "../store-sites.mjs";
 import { createCommandContext } from "../context.mjs";
-import { gscErrorHandler } from "../error-handler.mjs";
-import { loadSitemapUrls } from "../sitemap.mjs";
-import process from "node:process";
+import { toInspectionRecord } from "../inspection-record.mjs";
+import { appendInspections, loadInspectionState, materializeInspectionIndex, urlInProperty } from "../local-entities.mjs";
+import { checkInspectionBatch, inspectUrls } from "../inspect-urls.mjs";
 import { defineCommand } from "citty";
-import { batchInspectUrls } from "gscdump/indexing";
 function verdictTone(verdict) {
 	if (verdict === "PASS") return "\x1B[32m";
 	if (verdict === "NEUTRAL" || verdict === "PARTIAL") return "\x1B[33m";
@@ -76,126 +76,113 @@ function printInspection(url, inspection) {
 	}
 	console.log();
 }
-const batchCommand = defineCommand({
-	meta: {
-		name: "batch",
-		description: "Inspect many URLs from a file or stdin (one URL per line)"
-	},
+function outcomeJson(outcome) {
+	if (outcome.kind === "failed") return {
+		url: outcome.url,
+		status: "failed",
+		error: outcome.error
+	};
+	const indexStatus = outcome.result?.indexStatusResult;
+	return {
+		url: outcome.url,
+		status: "inspected",
+		verdict: indexStatus?.verdict ?? null,
+		coverageState: indexStatus?.coverageState ?? null,
+		indexingState: indexStatus?.indexingState ?? null,
+		lastCrawlTime: indexStatus?.lastCrawlTime ?? null,
+		isIndexed: indexStatus?.verdict === "PASS",
+		raw: outcome.result ?? null
+	};
+}
+function printOutcomeLine(outcome) {
+	if (outcome.kind === "failed") {
+		console.log(`  ${red("ERROR")}  ${outcome.url}  ${dim(outcome.error)}`);
+		return;
+	}
+	const indexStatus = outcome.result?.indexStatusResult;
+	console.log(`  ${colorVerdict(indexStatus?.verdict)}  ${outcome.url}  ${dim(indexStatus?.coverageState ?? "")}`);
+}
+const inspectCommand = defineCommand({
+	meta: inspectCommandMeta,
 	args: {
 		...OUTPUT_ARGS,
-		"site": {
+		site: {
 			type: "string",
 			alias: "s",
-			description: "Site URL (defaults to config.defaultSite or prompt)"
+			description: "Site, for example example.com; defaults to config.defaultSite or a prompt"
 		},
-		"urls": {
+		urls: {
 			type: "positional",
 			required: false,
-			description: "URLs (or use --file/--from-sitemap/stdin)"
+			description: "One or more URLs to inspect"
 		},
-		"file": {
+		file: {
 			type: "string",
 			alias: "f",
-			description: "File with URLs (one per line)"
-		},
-		"from-sitemap": {
-			type: "string",
-			description: "Sitemap URL (or sitemap index) to pull URLs from"
-		},
-		"delay-ms": {
-			type: "string",
-			default: "200",
-			description: "Delay between requests"
-		},
-		"concurrency": {
-			type: "string",
-			alias: "c",
-			default: "1",
-			description: "Concurrent in-flight requests"
+			description: "File with URLs, one per line"
 		}
 	},
 	async run({ args }) {
 		const { json, quiet } = applyOutputMode(args);
-		const delayMs = parseIntegerOption(args["delay-ms"], "--delay-ms", 0) ?? 200;
-		const concurrency = parseIntegerOption(args.concurrency, "--concurrency") ?? 1;
-		let urls;
-		if (args["from-sitemap"]) {
-			const result = await loadSitemapUrls(String(args["from-sitemap"]));
-			if (result._tag === "error") {
-				logger.error(`Sitemap fetch failed: ${result.message}`);
-				process.exit(1);
-			}
-			if (!result.value.complete) logger.warn("Sitemap walk was incomplete; inspecting only the URLs that were read");
-			urls = result.value.urls;
-		} else urls = await readUrlList(args);
-		if (urls.length === 0) {
-			logger.error("No URLs provided. Pass URLs as args, --file, --from-sitemap, or stdin.");
-			process.exit(1);
-		}
-		const ctx = await createCommandContext({ needsAuth: true });
+		const urls = [...new Set(await readUrlList({
+			file: args.file,
+			positionals: args._
+		}))];
+		if (urls.length === 0) throw new Error("No URLs given. Pass URLs as arguments, use --file, or pipe them on stdin.");
+		const batch = checkInspectionBatch(urls);
+		if (batch.kind === "too-many") throw new Error(batch.message);
+		const ctx = await createCommandContext({
+			needsAuth: true,
+			needsStore: true
+		});
+		const client = ctx.client;
+		const store = ctx.store;
 		const siteUrl = await ctx.resolveSite(args.site ? String(args.site) : void 0);
-		if (!quiet) logger.info(`Inspecting ${urls.length} URLs ...`);
-		const results = await batchInspectUrls(ctx.client, siteUrl, urls, {
-			delayMs,
-			concurrency,
-			onProgress: quiet ? void 0 : (r, i, total) => logger.info(`[${i + 1}/${total}] ${r.url} ${r.isIndexed ? "PASS" : "FAIL"}`)
-		}).catch(gscErrorHandler);
-		if (json) {
-			const flattened = results.map((r) => {
-				const indexStatus = r.inspection?.indexStatusResult;
-				return {
-					url: r.url,
-					verdict: indexStatus?.verdict || null,
-					coverageState: indexStatus?.coverageState || null,
-					indexingState: indexStatus?.indexingState || null,
-					lastCrawlTime: indexStatus?.lastCrawlTime || null,
-					isIndexed: r.isIndexed,
-					raw: r.inspection
-				};
-			});
-			console.log(JSON.stringify(flattened, null, 2));
-			return;
-		}
-		const indexed = results.filter((r) => r.isIndexed).length;
-		if (!quiet) logger.success(`Inspected ${results.length} URLs (${indexed} indexed, ${results.length - indexed} not)`);
-	}
-});
-const inspectCommand = defineCommand({
-	meta: inspectCommandMeta,
-	args: {
-		...OUTPUT_ARGS,
-		site: {
-			type: "string",
-			alias: "s",
-			description: "Site URL (defaults to config.defaultSite or prompt)"
-		},
-		url: {
-			type: "positional",
-			required: true,
-			description: "URL to inspect"
-		}
-	},
-	subCommands: { batch: batchCommand },
-	async run({ args }) {
-		const { json } = applyOutputMode(args);
-		const ctx = await createCommandContext({ needsAuth: true });
-		const siteUrl = await ctx.resolveSite(args.site ? String(args.site) : void 0);
-		const result = await ctx.client.inspect(siteUrl, args.url).catch(gscErrorHandler);
-		const inspection = result?.inspectionResult;
-		const indexStatus = inspection?.indexStatusResult;
-		if (json) {
-			console.log(JSON.stringify({
-				url: args.url,
-				verdict: indexStatus?.verdict || null,
-				coverageState: indexStatus?.coverageState || null,
-				indexingState: indexStatus?.indexingState || null,
-				lastCrawlTime: indexStatus?.lastCrawlTime || null,
-				isIndexed: indexStatus?.verdict === "PASS",
-				raw: result
-			}, null, 2));
-			return;
-		}
-		printInspection(args.url, inspection);
+		const claim = await recordStoreSite(store.dataDir, siteUrl, { userId: store.userId });
+		if (!claim.ok) throw new Error(formatSiteIdCollision(claim.error));
+		const tenant = {
+			userId: store.userId,
+			siteId: store.siteIdFor(siteUrl)
+		};
+		const { latest } = await loadInspectionState(store.dataSource, tenant, /* @__PURE__ */ new Date());
+		const saved = [];
+		if (!quiet && urls.length > 1) logger.info(`Inspecting ${urls.length} URLs ...`);
+		const run = await inspectUrls({
+			urls,
+			inspect: async (url) => (await client.inspect(siteUrl, url)).inspectionResult,
+			inProperty: (url) => urlInProperty(siteUrl, url),
+			onOutcome: async (outcome) => {
+				if (outcome.kind === "inspected") {
+					const record = toInspectionRecord({
+						url: outcome.url,
+						result: outcome.result,
+						inspectedAt: /* @__PURE__ */ new Date(),
+						previous: latest.get(outcome.url)
+					});
+					await appendInspections(store.dataSource, tenant, [record]);
+					saved.push(record);
+				}
+				if (!json && urls.length > 1) printOutcomeLine(outcome);
+			}
+		});
+		if (saved.length > 0) await materializeInspectionIndex(store.dataSource, tenant, latest, saved);
+		const failed = run.outcomes.filter((outcome) => outcome.kind === "failed");
+		const remaining = run.stopped?.remaining ?? 0;
+		if (json) console.log(JSON.stringify({
+			site: siteUrl,
+			inspected: saved.length,
+			failed: failed.length,
+			remaining,
+			...run.stopped ? { stoppedReason: run.stopped.reason } : {},
+			results: run.outcomes.map(outcomeJson)
+		}, null, 2));
+		else if (urls.length === 1 && run.outcomes[0]?.kind === "inspected") printInspection(run.outcomes[0].url, run.outcomes[0].result);
+		else if (urls.length === 1 && run.outcomes[0]?.kind === "failed") throw new Error(run.outcomes[0].error);
+		const summary = [saved.length > 0 ? `Inspected ${saved.length} of ${urls.length} URL${urls.length === 1 ? "" : "s"} and saved the results to the Store.` : `Inspected ${saved.length} of ${urls.length} URL${urls.length === 1 ? "" : "s"}. Nothing was saved to the Store.`];
+		if (failed.length > 0) summary.push(`${failed.length} failed.`);
+		if (run.stopped) summary.push(`${remaining} remaining. ${run.stopped.reason} Run the command again after the quota resets.`);
+		if (failed.length > 0 || run.stopped) throw new Error(summary.join(" "));
+		if (!quiet) logger.success(summary[0]);
 	}
 });
 export { inspectCommand };

package/dist/commands/mcp.mjs

@@ -1,69 +1,49 @@
-import { getCloudAccount, resolveAuthentication } from "../auth-state.mjs";
 import { mcpCommandMeta } from "../command-meta.mjs";
-import { loadConfig } from "../config.mjs";
+import { runWithCliRuntime, useCliRuntime } from "../runtime.mjs";
 import { VERSION } from "../utils.mjs";
-import { loadTokens, resolveBYOK, resolveServiceAccount } from "../auth.mjs";
+import { probeAuth } from "../auth.mjs";
 import { createCommandContext } from "../context.mjs";
 import { createGscMcpServer } from "../mcp/server/index.mjs";
-import process from "node:process";
 import { defineCommand } from "citty";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-async function checkAuth() {
-	const authentication = await resolveAuthentication();
-	if (authentication._tag === "Cloud") {
-		await getCloudAccount(authentication);
-		return { ok: true };
-	}
-	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 {
-		ok: false,
-		error: `GSCDump not configured.
-
-Run this command to set up authentication:
-
-  npx @gscdump/cli init
-
-Or set BYOK env vars: GSC_ACCESS_TOKEN, or GSC_CLIENT_ID + GSC_CLIENT_SECRET + GSC_REFRESH_TOKEN
-(GOOGLE_* aliases also accepted).
-
-Then restart your MCP client.`
-	};
-	if (!await loadTokens()) return {
-		ok: false,
-		error: `Authentication missing.
-
-Run this command to authenticate:
-
-  npx @gscdump/cli auth login
-
-Then restart your MCP client.`
-	};
-	return { ok: true };
+const MCP_NO_AUTH_MESSAGE = [
+	"gscdump has no Google authentication.",
+	"Run `gscdump auth login` in a terminal, then call this tool again.",
+	"For cloud mode, set GSCDUMP_API_KEY to a user API key from your gscdump.com settings.",
+	"For local mode, set GSC_SERVICE_ACCOUNT_JSON or GOOGLE_APPLICATION_CREDENTIALS to a service-account key file, set GSC_ACCESS_TOKEN, or set GSC_CLIENT_ID, GSC_CLIENT_SECRET, and GSC_REFRESH_TOKEN.",
+	"If you set environment variables, set them in the MCP server configuration and restart the MCP client.",
+	"If the gscdump command is missing, run `npm install -g @gscdump/cli`."
+].join(" ");
+const MCP_RETRIES = 1;
+async function startMcpServer(transport, runtime = useCliRuntime()) {
+	const server = createGscMcpServer({
+		name: "gscdump",
+		version: VERSION,
+		getContext: async () => {
+			if (await probeAuth() === "none") throw new Error(MCP_NO_AUTH_MESSAGE);
+			const ctx = await createCommandContext({
+				needsAuth: true,
+				fetchOptions: { retry: MCP_RETRIES }
+			}).catch((error) => {
+				if (error.authError?.kind === "not-service-account") throw new Error(`${error.message}. ${MCP_NO_AUTH_MESSAGE}`);
+				throw error;
+			});
+			return {
+				authentication: ctx.authentication,
+				auth: ctx.auth,
+				client: ctx.client
+			};
+		}
+	});
+	await server.connect(transport);
+	const handle = transport.onmessage;
+	if (handle) transport.onmessage = (message, extra) => runWithCliRuntime(runtime, () => handle(message, extra));
+	return server;
 }
 const mcpCommand = defineCommand({
 	meta: mcpCommandMeta,
 	async run() {
-		const authCheck = await checkAuth();
-		if (!authCheck.ok) {
-			process.stderr.write(`\n${authCheck.error}\n\n`);
-			process.exit(1);
-		}
-		const server = createGscMcpServer({
-			name: "gscdump",
-			version: VERSION,
-			getContext: async () => {
-				const ctx = await createCommandContext({ needsAuth: true });
-				return {
-					authentication: ctx.authentication,
-					auth: ctx.auth,
-					client: ctx.client
-				};
-			}
-		});
-		const transport = new StdioServerTransport();
-		await server.connect(transport);
+		await startMcpServer(new StdioServerTransport());
 	}
 });
-export { mcpCommand };
+export { MCP_NO_AUTH_MESSAGE, mcpCommand, startMcpServer };

package/dist/commands/papercut.mjs

@@ -1,5 +1,5 @@
-import { useCliRuntime } from "../runtime.mjs";
 import { papercutCommandMeta } from "../command-meta.mjs";
+import { useCliRuntime } from "../runtime.mjs";
 import { OUTPUT_ARGS, applyOutputMode, logger } from "../utils.mjs";
 import { buildPapercutBody, resolvePapercutUrl, submitPapercut } from "../papercut.mjs";
 import process from "node:process";

package/dist/commands/profile.mjs

@@ -1,9 +1,9 @@
-import { useCliRuntime } from "../runtime.mjs";
 import { profileCommandMeta } from "../command-meta.mjs";
+import { useCliRuntime } from "../runtime.mjs";
 import { getConfigDir, setConfigDir } from "../config.mjs";
 import { resolveCliEnvironment } from "../environment.mjs";
 import { ACTIVE_MARKER, PROFILES_DIR, ROOT_DIR, getProfileDir, readActiveMarkerSync } from "./profile-selection.mjs";
-import { OUTPUT_ARGS, applyOutputMode, displayPath, logger, noSubcommandSelected } from "../utils.mjs";
+import { OUTPUT_ARGS, applyOutputMode, displayPath, logger } from "../utils.mjs";
 import process from "node:process";
 import { defineCommand } from "citty";
 import fs from "node:fs/promises";
@@ -151,23 +151,24 @@ const createCmd = defineCommand({
 	},
 	args: {
 		...OUTPUT_ARGS,
-		"name": {
+		name: {
 			type: "positional",
 			required: true,
 			description: "Profile name"
 		},
-		"no-use": {
+		use: {
 			type: "boolean",
-			default: false,
-			description: "Do not mark the new profile as active"
+			default: true,
+			description: "Make the new profile active",
+			negativeDescription: "Create the profile without making it active"
 		}
 	},
 	async run({ args }) {
 		applyOutputMode(args);
 		const name = String(args.name);
 		const dir = await createProfile(name);
-		if (!args["no-use"]) await setActiveProfile(name);
-		logger.success(`Created profile: ${name}${args["no-use"] ? "" : " (active)"}`);
+		if (args.use) await setActiveProfile(name);
+		logger.success(`Created profile: ${name}${args.use ? " (active)" : ""}`);
 		logger.info(displayPath(dir));
 	}
 });
@@ -240,15 +241,6 @@ const profileCommand = defineCommand({
 		delete: deleteCmd
 	},
 	async run({ args }) {
-		if (!noSubcommandSelected("profile", [
-			"list",
-			"path",
-			"current",
-			"use",
-			"create",
-			"clear",
-			"delete"
-		])) return;
 		await listCmd.run?.({
 			args,
 			cmd: listCmd,