@gscdump/cli 3.7.0 → 4.0.0

package/dist/commands/report.mjs

@@ -1,69 +1,40 @@
 import { reportCommandMeta } from "../command-meta.mjs";
 import { terminalOutputOptions } from "../render/terminal.mjs";
-import { logger } from "../utils.mjs";
-import { resolveAnalysisSource } from "../analysis-local.mjs";
+import { logger, parseFetchBudget } from "../utils.mjs";
+import { COMPARISON_FLAGS, PERIOD_FLAGS, parseWindowFlags, windowFlagErrorToException } from "../window.mjs";
+import { analysisNeeds, analyzerSources, analyzerTables, resolveAnalysisSource } from "../analysis-local.mjs";
 import { renderCliReport } from "../render/report.mjs";
 import { defineCommand } from "citty";
+import { getLatestGscDate } from "gscdump/dates";
+import { DEFAULT_FETCH_BUDGET, MAX_FETCH_BUDGET } from "@gscdump/engine/analysis-types";
+import { unwrapResult } from "gscdump/result";
 import { defaultAnalyzerRegistry } from "@gscdump/analysis/registry";
-import { resolveWindow } from "@gscdump/engine/period";
-import { err, ok, unwrapResult } from "gscdump/result";
 import { defaultReportRegistry, dryRunReport, runReport } from "@gscdump/analysis/report";
-function reportFlagErrorToException(error) {
-	const exception = new Error(error.message);
-	exception.reportFlagError = error;
-	return exception;
-}
 const REPORT_IDS = defaultReportRegistry.listReportIds();
-const PERIOD_ALIASES = {
-	"7d": "last-7d",
-	"28d": "last-28d",
-	"30d": "last-30d",
-	"90d": "last-90d",
-	"180d": "last-180d",
-	"365d": "last-365d",
-	"last-7d": "last-7d",
-	"last-28d": "last-28d",
-	"last-30d": "last-30d",
-	"last-90d": "last-90d",
-	"last-180d": "last-180d",
-	"last-365d": "last-365d",
-	"mtd": "mtd",
-	"ytd": "ytd",
-	"custom": "custom"
-};
-const COMPARISON_ALIASES = {
-	"none": "none",
-	"prev": "prev-period",
-	"prev-period": "prev-period",
-	"prior": "prev-period",
-	"prior-period": "prev-period",
-	"yoy": "yoy"
-};
-function resolvePeriodResult(input, fallback) {
-	if (!input) return ok(fallback);
-	const preset = PERIOD_ALIASES[input.toLowerCase()];
-	if (!preset) return err({
-		kind: "unknown-period",
-		value: input,
-		message: `Unknown --period "${input}". Supported: 7d, 28d, 30d, 90d, 180d, 365d, mtd, ytd, custom.`
-	});
-	return ok(preset);
-}
-function resolvePeriod(input, fallback) {
-	return unwrapResult(resolvePeriodResult(input, fallback), reportFlagErrorToException);
+function reportDefaults(report) {
+	if (report.defaultPeriod === "custom") throw new Error(`Report "${report.id}" declares a custom default period. Declare a preset.`);
+	return {
+		preset: report.defaultPeriod,
+		comparison: report.defaultComparison
+	};
 }
-function resolveComparisonResult(input, fallback) {
-	if (!input) return ok(fallback);
-	const mode = COMPARISON_ALIASES[input.toLowerCase()];
-	if (!mode) return err({
-		kind: "unknown-comparison",
-		value: input,
-		message: `Unknown --vs "${input}". Supported: none, prev-period, yoy.`
-	});
-	return ok(mode);
+function windowFlags(args) {
+	const optional = (key) => args[key] ? String(args[key]) : void 0;
+	return {
+		period: optional("period"),
+		vs: optional("vs"),
+		start: optional("start"),
+		end: optional("end"),
+		prevStart: optional("prev-start"),
+		prevEnd: optional("prev-end")
+	};
 }
-function resolveComparison(input, fallback) {
-	return unwrapResult(resolveComparisonResult(input, fallback), reportFlagErrorToException);
+function reportSources(steps) {
+	const live = (type) => analyzerSources([type]).live;
+	return {
+		local: analyzerSources(steps.map((step) => step.type)).local,
+		live: steps.some((step) => live(step.type)) && steps.every((step) => !step.required || live(step.type))
+	};
 }
 function reportArgsToCitty(spec) {
 	const out = {};
@@ -107,29 +78,31 @@ function makeReportCommand(report) {
 			},
 			"period": {
 				type: "string",
-				description: "Window: 7d|28d|90d|mtd|ytd|custom",
-				default: presetToFlag(report.defaultPeriod)
+				description: `Window: ${PERIOD_FLAGS.join("|")} (default: ${presetToFlag(report.defaultPeriod)}, ending on the newest synced day)`
 			},
 			"vs": {
 				type: "string",
-				description: "Comparison: none|prev-period|yoy",
-				default: report.defaultComparison
+				description: `Comparison: ${COMPARISON_FLAGS.join("|")} (default: ${report.defaultComparison}). yoy compares with the same weekdays 52 weeks earlier`
 			},
 			"start": {
 				type: "string",
-				description: "Custom start date (YYYY-MM-DD)"
+				description: "Custom start date (YYYY-MM-DD). Implies --period custom"
 			},
 			"end": {
 				type: "string",
-				description: "Custom end date (YYYY-MM-DD)"
+				description: "Custom end date (YYYY-MM-DD). Implies --period custom"
 			},
 			"prev-start": {
 				type: "string",
-				description: "Override comparison start"
+				description: "Override comparison start (pass with --prev-end)"
 			},
 			"prev-end": {
 				type: "string",
-				description: "Override comparison end"
+				description: "Override comparison end (pass with --prev-start)"
+			},
+			"fetch-budget": {
+				type: "string",
+				description: `Max rows each live fetch reads (default: ${DEFAULT_FETCH_BUDGET}, max: ${MAX_FETCH_BUDGET})`
 			},
 			"live": {
 				type: "boolean",
@@ -154,20 +127,11 @@ function makeReportCommand(report) {
 			...reportArgs
 		},
 		async run({ args }) {
-			const preset = resolvePeriod(args.period, report.defaultPeriod);
-			const comparison = resolveComparison(args.vs, report.defaultComparison);
-			const window = resolveWindow({
-				preset,
-				comparison,
-				start: args.start,
-				end: args.end
-			});
-			if (args["prev-start"] && args["prev-end"]) window.comparison = {
-				start: String(args["prev-start"]),
-				end: String(args["prev-end"])
-			};
+			const flags = windowFlags(args);
 			const params = buildReportParams(report, args);
+			const fetchBudget = parseFetchBudget(args["fetch-budget"]);
 			if (args.explain || args["dry-run"]) {
+				const window = unwrapResult(parseWindowFlags(flags, reportDefaults(report), getLatestGscDate()), windowFlagErrorToException);
 				const ctx = {
 					site: args.site ? String(args.site) : "(unresolved)",
 					window,
@@ -178,21 +142,35 @@ function makeReportCommand(report) {
 				console.log(JSON.stringify({
 					id: report.id,
 					window,
-					comparison,
 					plan: dry.steps
 				}, null, 2));
 				return;
 			}
-			const { source, siteUrl } = await resolveAnalysisSource({
+			const steps = (window) => report.plan(params, window).map((step) => ({
+				type: step.type,
+				params: {
+					...step.params,
+					type: step.type
+				},
+				required: step.required === true
+			}));
+			const provisional = steps(unwrapResult(parseWindowFlags(flags, reportDefaults(report), getLatestGscDate()), windowFlagErrorToException));
+			const { source, siteUrl, anchor, isLive } = await resolveAnalysisSource({
 				site: args.site,
 				live: !!args.live,
-				json: !!args.json
+				json: !!args.json,
+				label: `report ${report.id}`,
+				types: provisional.map((step) => step.type),
+				sources: reportSources(provisional),
+				anchorTables: [...new Set(provisional.flatMap((step) => analyzerTables(step.params)))],
+				needs: (anchor) => steps(unwrapResult(parseWindowFlags(flags, reportDefaults(report), anchor), windowFlagErrorToException)).flatMap((step) => analysisNeeds(step.params))
 			});
 			const ctx = {
 				site: siteUrl,
-				window,
+				window: unwrapResult(parseWindowFlags(flags, reportDefaults(report), anchor), windowFlagErrorToException),
 				params,
-				registryVersion: defaultReportRegistry.version
+				registryVersion: defaultReportRegistry.version,
+				...fetchBudget !== void 0 ? { fetchBudget } : {}
 			};
 			const result = await runReport(report, {
 				source,
@@ -200,7 +178,13 @@ function makeReportCommand(report) {
 				ctx
 			});
 			if (args.json) {
-				console.log(JSON.stringify(result, null, 2));
+				console.log(JSON.stringify({
+					...result,
+					meta: {
+						...result.meta,
+						source: isLive ? "live" : "local"
+					}
+				}, null, 2));
 				return;
 			}
 			console.log(renderCliReport(result, terminalOutputOptions()));
@@ -209,8 +193,7 @@ function makeReportCommand(report) {
 	});
 }
 function presetToFlag(preset) {
-	if (preset === "mtd" || preset === "ytd" || preset === "custom") return preset;
-	return preset.replace(/^last-/, "");
+	return /^last-\d+d$/.test(preset) ? preset.replace(/^last-/, "") : preset;
 }
 const listCommand = defineCommand({
 	meta: {

package/dist/commands/rollups.mjs

@@ -1,4 +1,5 @@
 import { OUTPUT_ARGS, applyOutputMode, logger } from "../utils.mjs";
+import { readSiteMap, siteUrlForId } from "../store-sites.mjs";
 import { createCommandContext } from "../context.mjs";
 import { defineCommand } from "citty";
 import { buildQueryDimRecords, createQueryDimStore } from "@gscdump/engine/entities";
@@ -43,7 +44,7 @@ const rebuildSubCommand = defineCommand({
 		"site": {
 			type: "string",
 			alias: "s",
-			description: "Restrict to a single site (default: all sites with local data)"
+			description: "Restrict to one Site, for example example.com (default: every Site with local data)"
 		},
 		"with-canonical": {
 			type: "boolean",
@@ -54,8 +55,10 @@ const rebuildSubCommand = defineCommand({
 	async run({ args }) {
 		const { json } = applyOutputMode(args);
 		const defs = args["with-canonical"] ? [...DEFAULT_ROLLUPS, ...CANONICAL_ROLLUPS] : DEFAULT_ROLLUPS;
-		const store = (await createCommandContext({ needsStore: true })).store;
-		const explicitSiteId = args.site ? store.siteIdFor(String(args.site)) : void 0;
+		const ctx = await createCommandContext({ needsStore: true });
+		const store = ctx.store;
+		const explicitSiteId = args.site ? store.siteIdFor(await ctx.resolveSite(String(args.site), { scope: "store" })) : void 0;
+		const siteMap = await readSiteMap(store.dataDir, store.userId);
 		const allSiteIds = /* @__PURE__ */ new Set();
 		if (explicitSiteId) allSiteIds.add(explicitSiteId);
 		else {
@@ -75,9 +78,9 @@ const rebuildSubCommand = defineCommand({
 		for (const siteId of allSiteIds) {
 			if (args["with-canonical"]) {
 				const dimRows = await buildSiteQueryDim(store, siteId);
-				if (!json) logger.info(`Built query dimension for [${siteId}] (${dimRows} distinct queries, normalizer v${NORMALIZER_VERSION})`);
+				if (!json) logger.info(`Built query dimension for [${siteUrlForId(siteMap, siteId)}] (${dimRows} distinct queries, normalizer v${NORMALIZER_VERSION})`);
 			}
-			logger.info(`Rebuilding rollups for [${siteId}] (${defs.length} rollups)`);
+			logger.info(`Rebuilding rollups for [${siteUrlForId(siteMap, siteId)}] (${defs.length} rollups)`);
 			const results = await rebuildRollups({
 				engine: {
 					runSQL: (opts) => store.engine.runSQL(opts),
@@ -101,7 +104,7 @@ const rebuildSubCommand = defineCommand({
 				defs
 			});
 			const site = {
-				siteId,
+				siteUrl: siteUrlForId(siteMap, siteId),
 				rollups: []
 			};
 			for (const r of results) {

package/dist/commands/sitemaps.mjs

@@ -1,36 +1,16 @@
-import { parseAuthentication, resolveAuthentication } from "../auth-state.mjs";
 import { sitemapsCommandMeta } from "../command-meta.mjs";
-import { resolveCliEnvironment } from "../environment.mjs";
-import { OUTPUT_ARGS, applyOutputMode, logger, noSubcommandSelected, parseIntegerOption } from "../utils.mjs";
+import { OUTPUT_ARGS, applyOutputMode, logger, parseIntegerOption } from "../utils.mjs";
 import { createCommandContext } from "../context.mjs";
-import { gscErrorHandler } from "../error-handler.mjs";
 import { discoverLiveSitemap, loadSitemapUrls } from "../sitemap.mjs";
+import { HOSTED_ARGS, resolveHostedSite } from "../hosted-site.mjs";
 import process from "node:process";
 import { defineCommand } from "citty";
-import { createGscdumpV1Client } from "@gscdump/sdk/v1";
 import { fetchSitemap } from "gscdump/sites";
-const HOSTED_ARGS = {
-	"api-root": {
-		type: "string",
-		description: "Hosted API root; defaults to saved cloud authentication or https://gscdump.com/api"
-	},
-	"api-key": {
-		type: "string",
-		description: "Hosted API key; defaults to GSCDUMP_API_KEY"
-	}
-};
-async function hostedClient(args) {
-	const environment = resolveCliEnvironment().values;
-	const authentication = args["api-key"] ? parseAuthentication({
-		_tag: "Cloud",
-		apiKey: args["api-key"],
-		apiRoot: String(args["api-root"] || environment.GSCDUMP_API_ROOT || "https://gscdump.com/api")
-	}) : await resolveAuthentication();
-	if (authentication._tag !== "Cloud") throw new Error("Hosted sitemap reads require cloud authentication. Run `gscdump auth login --mode cloud` or supply --api-key.");
-	if (args["api-root"] && String(args["api-root"]).replace(/\/+$/, "") !== authentication.apiRoot) throw new Error("The API root changed. Supply --api-key explicitly for the new API root.");
-	return createGscdumpV1Client({
-		apiRoot: authentication.apiRoot,
-		credential: authentication.apiKey
+const HOSTED_SITEMAP_ALTERNATIVE = "read a live sitemap with `gscdump sitemaps urls <sitemap-url>`";
+function hostedSitemapSite(args, name) {
+	return resolveHostedSite(args, {
+		name: `sitemaps ${name}`,
+		localAlternative: HOSTED_SITEMAP_ALTERNATIVE
 	});
 }
 const listCommand = defineCommand({
@@ -43,7 +23,7 @@ const listCommand = defineCommand({
 		site: {
 			type: "string",
 			alias: "s",
-			description: "Site URL (e.g., sc-domain:example.com or https://example.com/)"
+			description: "Site, for example example.com"
 		},
 		pending: {
 			type: "boolean",
@@ -60,7 +40,7 @@ const listCommand = defineCommand({
 		const { json } = applyOutputMode(args);
 		const ctx = await createCommandContext({ needsAuth: true });
 		const siteUrl = await ctx.resolveSite(args.site ? String(args.site) : void 0);
-		let sitemaps = (await ctx.client.sitemaps.list(siteUrl).catch(gscErrorHandler)).map((sm) => ({
+		let sitemaps = (await ctx.client.sitemaps.list(siteUrl)).map((sm) => ({
 			path: sm.path,
 			type: sm.type || void 0,
 			isPending: sm.isPending || false,
@@ -100,7 +80,7 @@ const getCommand = defineCommand({
 		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"
 		},
 		url: {
 			type: "positional",
@@ -113,7 +93,7 @@ const getCommand = defineCommand({
 		const ctx = await createCommandContext({ needsAuth: true });
 		const siteUrl = await ctx.resolveSite(args.site ? String(args.site) : void 0);
 		const client = ctx.client;
-		const sitemap = await fetchSitemap(client, siteUrl, args.url).catch(gscErrorHandler);
+		const sitemap = await fetchSitemap(client, siteUrl, args.url);
 		if (json) {
 			console.log(JSON.stringify(sitemap, null, 2));
 			return;
@@ -143,7 +123,7 @@ const submitCommand = defineCommand({
 		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"
 		},
 		url: {
 			type: "positional",
@@ -155,7 +135,7 @@ const submitCommand = defineCommand({
 		const { json } = applyOutputMode(args);
 		const ctx = await createCommandContext({ needsAuth: true });
 		const siteUrl = await ctx.resolveSite(args.site ? String(args.site) : void 0);
-		await ctx.client.sitemaps.submit(siteUrl, args.url).catch(gscErrorHandler);
+		await ctx.client.sitemaps.submit(siteUrl, args.url);
 		if (json) {
 			console.log(JSON.stringify({
 				siteUrl,
@@ -177,7 +157,7 @@ const deleteCommand = defineCommand({
 		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"
 		},
 		url: {
 			type: "positional",
@@ -189,7 +169,7 @@ const deleteCommand = defineCommand({
 		const { json } = applyOutputMode(args);
 		const ctx = await createCommandContext({ needsAuth: true });
 		const siteUrl = await ctx.resolveSite(args.site ? String(args.site) : void 0);
-		await ctx.client.sitemaps.delete(siteUrl, args.url).catch(gscErrorHandler);
+		await ctx.client.sitemaps.delete(siteUrl, args.url);
 		if (json) {
 			console.log(JSON.stringify({
 				siteUrl,
@@ -238,6 +218,7 @@ const discoverCommand = defineCommand({
 		logger.success(`Discovered sitemap: ${url}`);
 	}
 });
+const SITEMAP_WALK_MAX_URLS = 1e6;
 const urlsCommand = defineCommand({
 	meta: {
 		name: "urls",
@@ -253,7 +234,7 @@ const urlsCommand = defineCommand({
 		"limit": {
 			type: "string",
 			alias: "l",
-			description: "Stop after N URLs across all nested sitemaps"
+			description: "Print at most N URLs across all nested sitemaps"
 		},
 		"max-depth": {
 			type: "string",
@@ -265,18 +246,17 @@ const urlsCommand = defineCommand({
 		const limit = parseIntegerOption(args.limit, "--limit");
 		const maxDepth = parseIntegerOption(args["max-depth"], "--max-depth", 0);
 		const result = await loadSitemapUrls(String(args.url), {
-			maxUrls: limit,
+			maxUrls: SITEMAP_WALK_MAX_URLS,
 			maxDepth
 		});
-		if (result._tag === "error") {
-			logger.error(`Sitemap fetch failed: ${result.message}`);
-			process.exit(1);
-		}
-		const { urls, complete, documentsRead } = result.value;
+		if (result._tag === "error") throw new Error(`Sitemap fetch failed: ${result.message}`);
+		const { complete, documentsRead } = result.value;
+		const urls = limit === void 0 ? result.value.urls : result.value.urls.slice(0, limit);
 		if (json) {
 			console.log(JSON.stringify({
 				sitemap: args.url,
 				count: urls.length,
+				found: result.value.urls.length,
 				complete,
 				documentsRead,
 				urls
@@ -290,20 +270,16 @@ const urlsCommand = defineCommand({
 const currentCommand = defineCommand({
 	meta: {
 		name: "current",
-		description: "Read the hosted canonical sitemap generation and feed list"
+		description: "Read the canonical sitemap generation and feed list (hosted)"
 	},
 	args: {
 		...OUTPUT_ARGS,
-		...HOSTED_ARGS,
-		"site-id": {
-			type: "positional",
-			required: true,
-			description: "Hosted gscdump site id"
-		}
+		...HOSTED_ARGS
 	},
 	async run({ args }) {
 		const { json } = applyOutputMode(args);
-		const result = await (await hostedClient(args)).getSiteSitemaps({ params: { siteId: String(args["site-id"]) } });
+		const { client, site } = await hostedSitemapSite(args, "current");
+		const result = await client.getSiteSitemaps({ params: { siteId: site.siteId } });
 		if (json) {
 			console.log(JSON.stringify(result.data, null, 2));
 			return;
@@ -316,17 +292,12 @@ const currentCommand = defineCommand({
 const historyCommand = defineCommand({
 	meta: {
 		name: "history",
-		description: "Read hosted canonical sitemap membership and lastmod changes"
+		description: "Read canonical sitemap membership and lastmod changes (hosted)"
 	},
 	args: {
 		...OUTPUT_ARGS,
 		...HOSTED_ARGS,
-		"site-id": {
-			type: "positional",
-			required: true,
-			description: "Hosted gscdump site id"
-		},
-		"days": {
+		days: {
 			type: "string",
 			description: "History window in days"
 		}
@@ -334,8 +305,9 @@ const historyCommand = defineCommand({
 	async run({ args }) {
 		const { json } = applyOutputMode(args);
 		const days = parseIntegerOption(args.days, "--days");
-		const result = await (await hostedClient(args)).getSiteSitemapChanges({
-			params: { siteId: String(args["site-id"]) },
+		const { client, site } = await hostedSitemapSite(args, "history");
+		const result = await client.getSiteSitemapChanges({
+			params: { siteId: site.siteId },
 			query: { ...days ? { days } : {} }
 		});
 		console.log(JSON.stringify(result.data, null, json ? 2 : 0));
@@ -344,22 +316,17 @@ const historyCommand = defineCommand({
 const membershipCommand = defineCommand({
 	meta: {
 		name: "membership",
-		description: "Query exact hosted membership evidence for comma-separated URLs"
+		description: "Query exact sitemap membership evidence for comma-separated URLs (hosted)"
 	},
 	args: {
 		...OUTPUT_ARGS,
 		...HOSTED_ARGS,
-		"site-id": {
-			type: "positional",
-			required: true,
-			description: "Hosted gscdump site id"
-		},
-		"urls": {
+		urls: {
 			type: "string",
 			required: true,
 			description: "Comma-separated exact URLs"
 		},
-		"generation": {
+		generation: {
 			type: "string",
 			description: "Pin the query to a generation id"
 		}
@@ -367,8 +334,9 @@ const membershipCommand = defineCommand({
 	async run({ args }) {
 		const { json } = applyOutputMode(args);
 		const urls = String(args.urls).split(",").map((url) => url.trim()).filter(Boolean);
-		const result = await (await hostedClient(args)).querySitemapMembership({
-			params: { siteId: String(args["site-id"]) },
+		const { client, site } = await hostedSitemapSite(args, "membership");
+		const result = await client.querySitemapMembership({
+			params: { siteId: site.siteId },
 			body: {
 				urls,
 				...args.generation ? { generationId: String(args.generation) } : {}
@@ -387,29 +355,24 @@ const membershipCommand = defineCommand({
 const lastmodCommand = defineCommand({
 	meta: {
 		name: "lastmod",
-		description: "List a generation-pinned hosted page of URL lastmod evidence"
+		description: "List a generation-pinned page of URL lastmod evidence (hosted)"
 	},
 	args: {
 		...OUTPUT_ARGS,
 		...HOSTED_ARGS,
-		"site-id": {
-			type: "positional",
-			required: true,
-			description: "Hosted gscdump site id"
-		},
-		"generation": {
+		generation: {
 			type: "string",
 			description: "Pin to a generation id"
 		},
-		"feedpath": {
+		feedpath: {
 			type: "string",
 			description: "Restrict to one exact sitemap feed URL"
 		},
-		"cursor": {
+		cursor: {
 			type: "string",
 			description: "Opaque cursor from the prior page"
 		},
-		"limit": {
+		limit: {
 			type: "string",
 			description: "Page size, maximum 10000"
 		}
@@ -417,8 +380,9 @@ const lastmodCommand = defineCommand({
 	async run({ args }) {
 		const { json } = applyOutputMode(args);
 		const limit = parseIntegerOption(args.limit, "--limit");
-		const result = await (await hostedClient(args)).listSitemapUrls({
-			params: { siteId: String(args["site-id"]) },
+		const { client, site } = await hostedSitemapSite(args, "lastmod");
+		const result = await client.listSitemapUrls({
+			params: { siteId: site.siteId },
 			query: {
 				...args.generation ? { generationId: String(args.generation) } : {},
 				...args.feedpath ? { feedpath: String(args.feedpath) } : {},
@@ -437,29 +401,25 @@ const lastmodCommand = defineCommand({
 const exportCommand = defineCommand({
 	meta: {
 		name: "export",
-		description: "Get a generation-pinned hosted bulk export descriptor"
+		description: "Get a generation-pinned bulk sitemap export descriptor (hosted)"
 	},
 	args: {
 		...OUTPUT_ARGS,
 		...HOSTED_ARGS,
-		"site-id": {
-			type: "positional",
-			required: true,
-			description: "Hosted gscdump site id"
-		},
-		"generation": {
+		generation: {
 			type: "string",
 			description: "Pin to a generation id"
 		},
-		"feedpath": {
+		feedpath: {
 			type: "string",
 			description: "Restrict to one exact sitemap feed URL"
 		}
 	},
 	async run({ args }) {
 		const { json } = applyOutputMode(args);
-		const result = await (await hostedClient(args)).getSitemapExport({
-			params: { siteId: String(args["site-id"]) },
+		const { client, site } = await hostedSitemapSite(args, "export");
+		const result = await client.getSitemapExport({
+			params: { siteId: site.siteId },
 			query: {
 				...args.generation ? { generationId: String(args.generation) } : {},
 				...args.feedpath ? { feedpath: String(args.feedpath) } : {}
@@ -489,19 +449,6 @@ const sitemapsCommand = defineCommand({
 		export: exportCommand
 	},
 	async run({ args }) {
-		if (!noSubcommandSelected("sitemaps", [
-			"list",
-			"get",
-			"submit",
-			"delete",
-			"discover",
-			"urls",
-			"current",
-			"history",
-			"membership",
-			"lastmod",
-			"export"
-		])) return;
 		await listCommand.run?.({
 			args,
 			cmd: listCommand,