@gscdump/cli 0.17.5 → 0.18.0

package/dist/index.mjs

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-import { a as loadConfig, c as setConfigDir, i as getConfigPath, l as __exportAll, n as defaultDataDir, o as resolveDataDir, r as getConfigDir, s as saveConfig } from "./_chunks/config.mjs";
 import process from "node:process";
 import { defineCommand, runMain } from "citty";
 import { defaultAnalyzerRegistry } from "@gscdump/analysis/registry";
@@ -15,9 +14,9 @@ import { createServer } from "node:http";
 import { JWT, OAuth2Client } from "google-auth-library";
 import { ofetch } from "ofetch";
 import fs$1 from "node:fs";
-import { Buffer } from "node:buffer";
+import { Buffer as Buffer$1 } from "node:buffer";
 import { createConsola } from "consola";
-import { SearchTypes, and, between, contains, country, date, device, eq, gsc, notRegex, page, query, regex, searchAppearance } from "gscdump/query";
+import { SearchTypes, and, between, contains, country, date, device, eq, gsc, hour, notRegex, page, query, regex, searchAppearance } from "gscdump/query";
 import { createNodeHarness } from "@gscdump/engine/node";
 import { TABLE_DIMS, transformGscRow } from "@gscdump/engine/ingest";
 import { allTables, inferTable } from "@gscdump/engine/schema";
@@ -31,6 +30,56 @@ import { resolveWindow } from "@gscdump/engine/period";
 import { inferLegacyTier } from "@gscdump/engine";
 import { DEFAULT_ROLLUPS, rebuildRollups } from "@gscdump/engine/rollups";
 import { filesystemStats } from "@gscdump/engine/filesystem";
+var __defProp = Object.defineProperty;
+var __exportAll = (all, no_symbols) => {
+	let target = {};
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
+	return target;
+};
+var config_exports = /* @__PURE__ */ __exportAll({
+	defaultDataDir: () => defaultDataDir,
+	getConfigDir: () => getConfigDir,
+	getConfigPath: () => getConfigPath,
+	loadConfig: () => loadConfig,
+	resolveDataDir: () => resolveDataDir,
+	saveConfig: () => saveConfig,
+	setConfigDir: () => setConfigDir
+});
+let configDir = path.join(os.homedir(), ".config", "gscdump");
+function setConfigDir(dir) {
+	configDir = dir;
+}
+function getConfigDir() {
+	return configDir;
+}
+function defaultDataDir() {
+	return path.join(os.homedir(), ".gscdump", "data");
+}
+function resolveDataDir(config) {
+	return expandTilde(config.dataDir ?? defaultDataDir());
+}
+function expandTilde(p) {
+	if (p === "~") return os.homedir();
+	if (p.startsWith("~/")) return path.join(os.homedir(), p.slice(2));
+	return p;
+}
+async function loadConfig() {
+	return fs.readFile(path.join(configDir, "config.json"), "utf-8").then((data) => JSON.parse(data)).catch(() => ({}));
+}
+async function saveConfig(config) {
+	await fs.mkdir(configDir, {
+		recursive: true,
+		mode: 448
+	});
+	await fs.writeFile(path.join(configDir, "config.json"), JSON.stringify(config, null, 2), { mode: 384 });
+}
+function getConfigPath() {
+	return path.join(configDir, "config.json");
+}
 const ENV_LINE_RE$1 = /^([^=]+)=(.*)$/;
 function parseEnvFile(envPath) {
 	let content;
@@ -73,9 +122,16 @@ function loadEnvFromCwd() {
 	}
 	return applied;
 }
-var version = "0.17.5";
+var version = "0.18.0";
 const ALL_SEARCH_TYPES$1 = Object.values(SearchTypes);
 const VERSION = version;
+function noSubcommandSelected(parent, subNames) {
+	const idx = process.argv.indexOf(parent);
+	if (idx < 0) return true;
+	const next = process.argv[idx + 1];
+	if (!next) return true;
+	return !subNames.includes(next);
+}
 const baseLogger = createConsola({
 	stdout: process.stderr,
 	stderr: process.stderr
@@ -128,7 +184,7 @@ function wrapStdoutForNoColor() {
 	const original = process.stdout.write.bind(process.stdout);
 	process.stdout.write = ((chunk, ...rest) => {
 		if (typeof chunk === "string") chunk = chunk.replace(ANSI_RE, "");
-		else if (chunk instanceof Uint8Array) chunk = Buffer.from(chunk).toString("utf8").replace(ANSI_RE, "");
+		else if (chunk instanceof Uint8Array) chunk = Buffer$1.from(chunk).toString("utf8").replace(ANSI_RE, "");
 		return original(chunk, ...rest);
 	});
 }
@@ -201,7 +257,7 @@ async function readUrlList$1(args) {
 	if (!process.stdin.isTTY) {
 		const chunks = [];
 		for await (const chunk of process.stdin) chunks.push(chunk);
-		return Buffer.concat(chunks).toString("utf-8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
+		return Buffer$1.concat(chunks).toString("utf-8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
 	}
 	return [];
 }
@@ -335,8 +391,10 @@ async function getAuthCredentials(interactive) {
 	const envClientId = process.env.GOOGLE_CLIENT_ID;
 	const envClientSecret = process.env.GOOGLE_CLIENT_SECRET;
 	if (envClientId && envClientSecret) {
-		logger.info("Using OAuth client from env");
-		console.log(`  \x1B[90m${envClientId}\x1B[0m`);
+		if (interactive) {
+			logger.info("Using OAuth client from env");
+			console.log(`  \x1B[90m${envClientId}\x1B[0m`);
+		}
 		return {
 			clientId: envClientId,
 			clientSecret: envClientSecret
@@ -344,8 +402,10 @@ async function getAuthCredentials(interactive) {
 	}
 	const config = await loadConfig();
 	if (config.clientId && config.clientSecret) {
-		logger.info(`Using OAuth client from ${displayPath(`${getConfigDir()}/config.json`)}`);
-		console.log(`  \x1B[90m${config.clientId}\x1B[0m`);
+		if (interactive) {
+			logger.info(`Using OAuth client from ${displayPath(`${getConfigDir()}/config.json`)}`);
+			console.log(`  \x1B[90m${config.clientId}\x1B[0m`);
+		}
 		return {
 			clientId: config.clientId,
 			clientSecret: config.clientSecret
@@ -429,13 +489,18 @@ async function getAuthCodeViaLoopback(authUrl) {
 			console.log(`  \x1B[90mIf browser doesn't open, visit:\x1B[0m`);
 			console.log(`  \x1B[36m${fullAuthUrl}\x1B[0m`);
 			console.log();
+			console.log(`  \x1B[90mIf Google says "redirect_uri_mismatch", your OAuth client is`);
+			console.log(`  not a "Desktop application" type. Create a Desktop client at`);
+			console.log(`  https://console.cloud.google.com/apis/credentials, then run`);
+			console.log(`  \`gscdump init --force\` with the new ID/secret.\x1B[0m`);
+			console.log();
 			import("open").then(({ default: open }) => open(fullAuthUrl)).catch(() => {
 				logger.warn("Could not open browser automatically");
 			});
 		});
 		server.on("error", (err) => settle(() => reject(err)));
 		timeoutId = setTimeout(() => {
-			settle(() => reject(/* @__PURE__ */ new Error("Authorization timed out")));
+			settle(() => reject(/* @__PURE__ */ new Error("Authorization timed out. If Google showed \"redirect_uri_mismatch\", your OAuth client must be type \"Desktop application\" (create one at https://console.cloud.google.com/apis/credentials and run `gscdump init --force`).")));
 		}, 300 * 1e3);
 	});
 }
@@ -455,23 +520,39 @@ async function authenticate(credentials, interactive, opts = {}) {
 		return oauth2Client;
 	}
 	const existingTokens = !opts.force ? await loadTokens() : null;
+	let refreshFailed = false;
+	let refreshError = null;
 	if (existingTokens) {
 		oauth2Client.setCredentials(existingTokens);
 		if (existingTokens.expiry_date && existingTokens.expiry_date < Date.now()) {
-			const { credentials: newTokens } = await oauth2Client.refreshAccessToken().catch(() => ({ credentials: null }));
-			if (newTokens) {
-				await saveTokens(newTokens);
-				oauth2Client.setCredentials(newTokens);
-				logger.success("Token refreshed");
+			const result = await oauth2Client.refreshAccessToken().then((r) => ({
+				credentials: r.credentials,
+				error: null
+			})).catch((e) => ({
+				credentials: null,
+				error: e
+			}));
+			if (result.credentials) {
+				await saveTokens(result.credentials);
+				oauth2Client.setCredentials(result.credentials);
+				if (interactive) logger.success("Token refreshed");
 				return oauth2Client;
 			}
+			refreshFailed = true;
+			refreshError = result.error;
 		} else {
-			logger.success("Using saved credentials");
+			if (interactive) logger.success("Using saved credentials");
 			return oauth2Client;
 		}
 	}
 	if (!interactive) {
-		logger.error("No saved tokens. Run interactively first to authenticate.");
+		if (refreshFailed) {
+			logger.error(`Token refresh failed${refreshError ? `: ${refreshError.message}` : ""}`);
+			logger.info("Refresh token may be revoked or expired. Run `gscdump auth login` to re-authenticate.");
+		} else {
+			logger.error("Not authenticated");
+			logger.info("Run `gscdump auth login` (or `gscdump init` for full setup).");
+		}
 		process.exit(1);
 	}
 	if (opts.noBrowser) {
@@ -1125,6 +1206,183 @@ const analyzeCommand = defineCommand({
 		...Object.fromEntries(ANALYSIS_TOOLS.map((tool) => [tool, makeToolCommand(tool)]))
 	}
 });
+const ENV_LINE_RE = /^([^=]+)=(.*)$/;
+async function promptDataDir(existing) {
+	const fallback = existing ?? defaultDataDir();
+	const answer = await text({
+		message: "Where should Parquet data be stored?",
+		placeholder: fallback,
+		defaultValue: fallback
+	});
+	if (isCancel(answer)) process.exit(1);
+	return String(answer) || fallback;
+}
+async function loadEnvFile() {
+	const envPath = path.join(process.cwd(), ".env");
+	const content = await fs.readFile(envPath, "utf-8").catch(() => null);
+	if (!content) return null;
+	const env = {};
+	for (const line of content.split("\n")) {
+		const trimmed = line.trim();
+		if (!trimmed || trimmed.startsWith("#")) continue;
+		const match = trimmed.match(ENV_LINE_RE);
+		if (match) {
+			const key = match[1].trim();
+			let value = match[2].trim();
+			if (value.startsWith("\"") && value.endsWith("\"") || value.startsWith("'") && value.endsWith("'")) value = value.slice(1, -1);
+			env[key] = value;
+		}
+	}
+	return env;
+}
+const initCommand = defineCommand({
+	meta: {
+		name: "init",
+		description: "Set up GSCDump authentication"
+	},
+	args: {
+		"force": {
+			type: "boolean",
+			alias: "f",
+			description: "Force re-initialization"
+		},
+		"no-store": {
+			type: "boolean",
+			default: false,
+			description: "Skip dataDir prompt (auth-only setup)"
+		},
+		...OUTPUT_ARGS
+	},
+	async run({ args }) {
+		applyOutputMode(args);
+		const config = await loadConfig();
+		if (config.clientId && config.clientSecret && !args.force) {
+			logger.info("Already configured");
+			const tokens = await loadTokens();
+			if (!tokens) logger.info("No saved tokens. Run `gscdump auth login` to authenticate.");
+			else {
+				const isExpired = tokens.expiry_date && tokens.expiry_date < Date.now();
+				if (isExpired && tokens.refresh_token) logger.info("Tokens expired but refresh available. Any live command will auto-refresh, or run `gscdump auth refresh`.");
+				else if (isExpired) logger.warn("Tokens expired without a refresh token. Run `gscdump auth login` to re-authenticate.");
+				else logger.info("Next: `gscdump sites` to list properties, or `gscdump query --help`.");
+			}
+			logger.info("Run `gscdump init --force` to reconfigure.");
+			return;
+		}
+		const byok = resolveBYOK();
+		if (byok) {
+			const dataDir = args["no-store"] ? void 0 : await promptDataDir(config.dataDir);
+			await saveConfig({
+				...config,
+				dataDir: dataDir ?? config.dataDir
+			});
+			logger.success(`BYOK detected (${typeof byok === "string" ? "access-token" : "refresh-token"}) — auth setup skipped`);
+			logger.success("Setup complete! Run gscdump to get started.");
+			return;
+		}
+		const envFile = await loadEnvFile();
+		const envCid = envFile?.GSC_CLIENT_ID ?? envFile?.GOOGLE_CLIENT_ID;
+		const envSec = envFile?.GSC_CLIENT_SECRET ?? envFile?.GOOGLE_CLIENT_SECRET;
+		const envRef = envFile?.GSC_REFRESH_TOKEN ?? envFile?.GOOGLE_REFRESH_TOKEN;
+		const envAcc = envFile?.GSC_ACCESS_TOKEN ?? envFile?.GOOGLE_ACCESS_TOKEN;
+		if (envCid && envSec && envRef) {
+			logger.info("Found .env file with credentials");
+			process.env.GOOGLE_CLIENT_ID = envCid;
+			process.env.GOOGLE_CLIENT_SECRET = envSec;
+			process.env.GOOGLE_REFRESH_TOKEN = envRef;
+			if (envAcc) process.env.GOOGLE_ACCESS_TOKEN = envAcc;
+			await saveConfig({
+				...config,
+				clientId: envCid,
+				clientSecret: envSec,
+				dataDir: config.dataDir ?? defaultDataDir()
+			});
+			const creds = (await authenticate({
+				clientId: envCid,
+				clientSecret: envSec
+			}, false)).credentials;
+			if (creds.access_token) await saveTokens({
+				access_token: creds.access_token,
+				refresh_token: creds.refresh_token || envRef,
+				expiry_date: creds.expiry_date
+			});
+			console.log();
+			logger.success("Setup complete using .env credentials! Run gscdump to get started.");
+			return;
+		}
+		console.log();
+		console.log("  \x1B[1mWelcome to GSCDump!\x1B[0m");
+		console.log("  \x1B[90mGoogle Search Console data extraction CLI\x1B[0m");
+		console.log();
+		const dataDir = args["no-store"] ? void 0 : await promptDataDir(config.dataDir);
+		const credentials = await getAuthCredentials(true);
+		await saveConfig({
+			...config,
+			...dataDir ? { dataDir } : {},
+			clientId: credentials.clientId,
+			clientSecret: credentials.clientSecret
+		});
+		await smokeTest(await authenticate(credentials, true));
+		await maybeWriteEnvFile(credentials.clientId, credentials.clientSecret);
+		console.log();
+		logger.success("Setup complete! Run gscdump to get started.");
+	}
+});
+async function smokeTest(oauth) {
+	await runSmokeTest(oauth);
+}
+async function runSmokeTest(oauth) {
+	const sites = await googleSearchConsole(oauth).sites().catch((e) => e);
+	if (sites instanceof Error) {
+		const msg = sites.message;
+		const apiDisabledMatch = msg.match(/projects?\/(\d+)/) ?? msg.match(/project (\d+)/);
+		if (/has not been used in project|API has not been used|SERVICE_DISABLED/i.test(msg)) {
+			logger.error("Search Console API is not enabled for this Google Cloud project.");
+			const project = apiDisabledMatch?.[1];
+			const url = project ? `https://console.developers.google.com/apis/api/searchconsole.googleapis.com/overview?project=${project}` : "https://console.developers.google.com/apis/api/searchconsole.googleapis.com/overview";
+			logger.info(`Enable it here, then retry: ${url}`);
+			logger.info("Note: it can take a few minutes to propagate after enabling.");
+			return;
+		}
+		if (/insufficient|scope|forbidden|403/i.test(msg)) {
+			logger.warn(`Smoke test failed (likely missing scopes): ${msg}`);
+			logger.info("Run `gscdump auth login --force` to re-consent with the required scopes.");
+			return;
+		}
+		logger.warn(`Smoke test failed: ${msg}`);
+		logger.info("Auth saved, but verify via `gscdump auth status` / `gscdump doctor`.");
+		return;
+	}
+	logger.success(`Verified: ${sites.length} GSC site(s) accessible`);
+}
+async function maybeWriteEnvFile(clientId, clientSecret) {
+	const tokens = await loadTokens();
+	if (!tokens?.refresh_token) return;
+	const wants = await confirm({
+		message: "Write a `.env` file with these credentials? (handy for CI / other machines)",
+		initialValue: false
+	});
+	if (isCancel(wants) || !wants) return;
+	const envPath = path.join(process.cwd(), ".env");
+	if (await fs.stat(envPath).then(() => true).catch(() => false)) {
+		const overwrite = await confirm({
+			message: `${displayPath(envPath)} exists. Overwrite?`,
+			initialValue: false
+		});
+		if (isCancel(overwrite) || !overwrite) {
+			logger.info(`Skipped — keep credentials at ${displayPath(envPath)} manually if needed`);
+			return;
+		}
+	}
+	const content = [
+		`GSC_CLIENT_ID=${clientId}`,
+		`GSC_CLIENT_SECRET=${clientSecret}`,
+		`GSC_REFRESH_TOKEN=${tokens.refresh_token}`,
+		""
+	].join("\n");
+	await fs.writeFile(envPath, content, { mode: 384 });
+	logger.success(`Wrote ${displayPath(envPath)}`);
+}
 const ROOT_DIR = path.join(os.homedir(), ".config", "gscdump");
 const PROFILES_DIR = path.join(ROOT_DIR, "profiles");
 const ACTIVE_MARKER = path.join(ROOT_DIR, "active-profile");
@@ -1204,37 +1462,38 @@ async function adoptCurrentConfigAsProfile(name) {
 	setConfigDir(targetDir);
 	return targetDir;
 }
+const listCmd = defineCommand({
+	meta: {
+		name: "list",
+		description: "List configured profiles"
+	},
+	args: { ...OUTPUT_ARGS },
+	async run({ args }) {
+		const { json } = applyOutputMode(args);
+		const names = await listProfiles();
+		const active = resolveActiveProfile();
+		if (json) {
+			console.log(JSON.stringify({
+				active,
+				profiles: names
+			}, null, 2));
+			return;
+		}
+		if (names.length === 0) {
+			logger.warn(`No profiles in ${PROFILES_DIR}`);
+			logger.info("Run `gscdump auth login` to create one automatically, or `gscdump profile create <name>`");
+			return;
+		}
+		for (const n of names) console.log(`${n === active ? "*" : " "} ${n}`);
+	}
+});
 const profileCommand = defineCommand({
 	meta: {
 		name: "profile",
 		description: "Manage gscdump profiles (per-account token + config dirs)"
 	},
 	subCommands: {
-		list: defineCommand({
-			meta: {
-				name: "list",
-				description: "List configured profiles"
-			},
-			args: { ...OUTPUT_ARGS },
-			async run({ args }) {
-				const { json } = applyOutputMode(args);
-				const names = await listProfiles();
-				const active = resolveActiveProfile();
-				if (json) {
-					console.log(JSON.stringify({
-						active,
-						profiles: names
-					}, null, 2));
-					return;
-				}
-				if (names.length === 0) {
-					logger.warn(`No profiles in ${PROFILES_DIR}`);
-					logger.info("Run `gscdump auth login` to create one automatically, or `gscdump profile create <name>`");
-					return;
-				}
-				for (const n of names) console.log(`${n === active ? "*" : " "} ${n}`);
-			}
-		}),
+		list: listCmd,
 		path: defineCommand({
 			meta: {
 				name: "path",
@@ -1375,8 +1634,31 @@ const profileCommand = defineCommand({
 				logger.success(`Removed profile: ${name}`);
 			}
 		})
+	},
+	async run({ args }) {
+		if (!noSubcommandSelected("profile", [
+			"list",
+			"path",
+			"current",
+			"use",
+			"create",
+			"clear",
+			"delete"
+		])) return;
+		await listCmd.run?.({
+			args,
+			cmd: listCmd,
+			rawArgs: []
+		});
 	}
 });
+const AUTH_SUBCOMMANDS = [
+	"status",
+	"login",
+	"logout",
+	"refresh",
+	"scopes"
+];
 const REQUIRED_SCOPES$1 = [
 	"https://www.googleapis.com/auth/webmasters",
 	"https://www.googleapis.com/auth/indexing",
@@ -1405,6 +1687,66 @@ async function resolveLiveAuthState() {
 		missing
 	};
 }
+async function runStatus(args) {
+	const { json } = applyOutputMode(args);
+	const { byok, tokens, tokenInfo, scopes, missing } = await resolveLiveAuthState();
+	const byokKind = byok ? typeof byok === "string" ? "access-token" : "refresh-token" : null;
+	if (json) {
+		console.log(JSON.stringify({
+			authenticated: !!tokens || !!byok,
+			source: byok ? "byok" : tokens ? "saved-tokens" : null,
+			byokKind,
+			scopes,
+			tokenAccount: tokenInfo?.email ?? null,
+			tokens: tokens ? {
+				hasAccessToken: !!tokens.access_token,
+				hasRefreshToken: !!tokens.refresh_token,
+				expiry: tokens.expiry_date ? new Date(tokens.expiry_date).toISOString() : null,
+				expired: tokens.expiry_date ? tokens.expiry_date < Date.now() : null
+			} : null
+		}, null, 2));
+		return;
+	}
+	const reportScopes = () => {
+		if (scopes.length === 0) return;
+		console.log(`  Scopes:`);
+		for (const s of scopes) console.log(`    \x1B[90m└─\x1B[0m ${s}`);
+		if (missing.length > 0) {
+			console.log(`  \x1B[33mMissing scopes:\x1B[0m`);
+			for (const s of missing) console.log(`    \x1B[90m└─\x1B[0m ${s}`);
+			console.log(`  \x1B[90mRun \`gscdump auth login --force\` to re-consent.\x1B[0m`);
+		}
+	};
+	if (byok) {
+		logger.success(`Authenticated via BYOK (${byokKind})`);
+		if (tokenInfo?.email) console.log(`  Account:       ${tokenInfo.email}`);
+		reportScopes();
+		return;
+	}
+	if (!tokens) {
+		logger.warn("Not authenticated");
+		logger.info("Run `gscdump init` (full setup) or `gscdump auth login` (OAuth only)");
+		logger.info("Or set GSC_ACCESS_TOKEN / GSC_CLIENT_ID + GSC_CLIENT_SECRET + GSC_REFRESH_TOKEN env vars");
+		return;
+	}
+	const hasAccess = !!tokens.access_token;
+	const hasRefresh = !!tokens.refresh_token;
+	const expiry = tokens.expiry_date ? new Date(tokens.expiry_date) : null;
+	const isExpired = expiry && expiry < /* @__PURE__ */ new Date();
+	if (isExpired && hasRefresh) logger.warn("Token expired; refresh available. Run `gscdump auth refresh`, or any live command will auto-refresh.");
+	else if (isExpired) logger.error("Token expired and no refresh token present. Run `gscdump auth login`.");
+	else logger.success("Authenticated (saved tokens)");
+	console.log();
+	console.log(`  Access token:  ${hasAccess ? "\x1B[32mpresent\x1B[0m" : "\x1B[31mmissing\x1B[0m"}`);
+	console.log(`  Refresh token: ${hasRefresh ? "\x1B[32mpresent\x1B[0m" : "\x1B[31mmissing\x1B[0m"}`);
+	if (expiry) {
+		const status = isExpired ? "\x1B[33mexpired\x1B[0m" : "\x1B[32mvalid\x1B[0m";
+		console.log(`  Expires:       ${expiry.toISOString()} (${status})`);
+	}
+	if (tokenInfo?.email) console.log(`  Account:       ${tokenInfo.email}`);
+	reportScopes();
+	if (isExpired && !hasRefresh) process.exit(1);
+}
 const statusCommand$1 = defineCommand({
 	meta: {
 		name: "status",
@@ -1412,61 +1754,7 @@ const statusCommand$1 = defineCommand({
 	},
 	args: { ...OUTPUT_ARGS },
 	async run({ args }) {
-		const { json } = applyOutputMode(args);
-		const { byok, tokens, tokenInfo, scopes, missing } = await resolveLiveAuthState();
-		const byokKind = byok ? typeof byok === "string" ? "access-token" : "refresh-token" : null;
-		if (json) {
-			console.log(JSON.stringify({
-				authenticated: !!tokens || !!byok,
-				source: byok ? "byok" : tokens ? "saved-tokens" : null,
-				byokKind,
-				scopes,
-				tokenAccount: tokenInfo?.email ?? null,
-				tokens: tokens ? {
-					hasAccessToken: !!tokens.access_token,
-					hasRefreshToken: !!tokens.refresh_token,
-					expiry: tokens.expiry_date ? new Date(tokens.expiry_date).toISOString() : null,
-					expired: tokens.expiry_date ? tokens.expiry_date < Date.now() : null
-				} : null
-			}, null, 2));
-			return;
-		}
-		const reportScopes = () => {
-			if (scopes.length === 0) return;
-			console.log(`  Scopes:`);
-			for (const s of scopes) console.log(`    \x1B[90m└─\x1B[0m ${s}`);
-			if (missing.length > 0) {
-				console.log(`  \x1B[33mMissing scopes:\x1B[0m`);
-				for (const s of missing) console.log(`    \x1B[90m└─\x1B[0m ${s}`);
-				console.log(`  \x1B[90mRun \`gscdump auth login --force\` to re-consent.\x1B[0m`);
-			}
-		};
-		if (byok) {
-			logger.success(`Authenticated via BYOK (${byokKind})`);
-			if (tokenInfo?.email) console.log(`  Account:       ${tokenInfo.email}`);
-			reportScopes();
-			return;
-		}
-		if (!tokens) {
-			logger.warn("Not authenticated");
-			logger.info("Run `gscdump init` (full setup) or `gscdump auth login` (OAuth only)");
-			logger.info("Or set GSC_ACCESS_TOKEN / GSC_CLIENT_ID + GSC_CLIENT_SECRET + GSC_REFRESH_TOKEN env vars");
-			return;
-		}
-		const hasAccess = !!tokens.access_token;
-		const hasRefresh = !!tokens.refresh_token;
-		const expiry = tokens.expiry_date ? new Date(tokens.expiry_date) : null;
-		const isExpired = expiry && expiry < /* @__PURE__ */ new Date();
-		logger.success("Authenticated (saved tokens)");
-		console.log();
-		console.log(`  Access token:  ${hasAccess ? "\x1B[32mpresent\x1B[0m" : "\x1B[31mmissing\x1B[0m"}`);
-		console.log(`  Refresh token: ${hasRefresh ? "\x1B[32mpresent\x1B[0m" : "\x1B[31mmissing\x1B[0m"}`);
-		if (expiry) {
-			const status = isExpired ? "\x1B[33mexpired\x1B[0m" : "\x1B[32mvalid\x1B[0m";
-			console.log(`  Expires:       ${expiry.toISOString()} (${status})`);
-		}
-		if (tokenInfo?.email) console.log(`  Account:       ${tokenInfo.email}`);
-		reportScopes();
+		await runStatus(args);
 	}
 });
 const refreshCommand = defineCommand({
@@ -1501,126 +1789,135 @@ const refreshCommand = defineCommand({
 		else logger.warn("Refresh completed but no new access token returned");
 	}
 });
-const authCommand = defineCommand({
+const loginCommand = defineCommand({
 	meta: {
-		name: "auth",
-		description: "Manage authentication"
+		name: "login",
+		description: "Run OAuth flow and persist tokens (skip if BYOK env vars set)"
 	},
-	subCommands: {
-		status: statusCommand$1,
-		login: defineCommand({
-			meta: {
-				name: "login",
-				description: "Run OAuth flow and persist tokens (skip if BYOK env vars set)"
-			},
-			args: {
-				...OUTPUT_ARGS,
-				"force": {
-					type: "boolean",
-					alias: "f",
-					default: false,
-					description: "Re-run OAuth even if tokens already exist"
-				},
-				"browser": {
-					type: "boolean",
-					default: true,
-					description: "Use loopback browser flow. Pass --no-browser for device-code (headless)."
-				},
-				"service-account": {
-					type: "string",
-					description: "Path to a service-account JSON key (skips OAuth)"
-				}
-			},
-			async run({ args }) {
-				applyOutputMode(args);
-				if (resolveBYOK() && !args.force) {
-					logger.info("BYOK env vars detected, no login needed (--force to override)");
-					return;
-				}
-				if (args["service-account"]) {
-					const saPath = path.resolve(String(args["service-account"]));
-					const jwt = await loadServiceAccount(saPath).catch((e) => {
-						logger.error(`Service-account load failed: ${e.message}`);
-						process.exit(1);
-					});
-					await jwt.authorize().catch((e) => {
-						logger.error(`Service-account auth failed: ${e.message}`);
-						process.exit(1);
-					});
-					const config = await loadConfig();
-					config.serviceAccountPath = saPath;
-					await saveConfig(config);
-					logger.success(`Service-account verified: ${jwt.email ?? "OK"}`);
-					logger.info(`Saved path to config: ${saPath}`);
-					return;
-				}
-				if (args.force) await clearTokens();
-				await getAuth({
-					interactive: true,
-					noBrowser: args.browser === false,
-					force: Boolean(args.force)
-				}).catch((e) => {
-					logger.error(`Login failed: ${e.message}`);
-					process.exit(1);
-				});
-				logger.success("Logged in");
-				if (!resolveActiveProfile()) {
-					const tokens = await loadTokens();
-					const info = tokens?.access_token ? await fetchTokenInfo(tokens.access_token) : null;
-					if (info?.email) {
-						const name = profileNameFromEmail(info.email);
-						if (await adoptCurrentConfigAsProfile(name).catch(() => null)) logger.success(`Saved as profile "${name}" (active)`);
-					}
-				}
-				if (resolveBYOK()) {
-					console.log();
-					console.log(await formatAuthProvenance());
-				}
-			}
-		}),
-		logout: defineCommand({
-			meta: {
-				name: "logout",
-				description: "Clear stored OAuth tokens"
-			},
-			args: { ...OUTPUT_ARGS },
-			async run({ args }) {
-				applyOutputMode(args);
-				await clearTokens();
-				const config = await loadConfig();
-				if (config.serviceAccountPath) {
-					delete config.serviceAccountPath;
-					await saveConfig(config);
-					logger.info("Cleared saved service-account path");
-				}
+	args: {
+		...OUTPUT_ARGS,
+		"force": {
+			type: "boolean",
+			alias: "f",
+			default: false,
+			description: "Re-run OAuth even if tokens already exist"
+		},
+		"browser": {
+			type: "boolean",
+			default: true,
+			description: "Use loopback browser flow. Pass --no-browser for device-code (headless)."
+		},
+		"service-account": {
+			type: "string",
+			description: "Path to a service-account JSON key (skips OAuth)"
+		}
+	},
+	async run({ args }) {
+		applyOutputMode(args);
+		if (resolveBYOK() && !args.force) {
+			logger.info("BYOK env vars detected, no login needed (--force to override)");
+			return;
+		}
+		if (args["service-account"]) {
+			const saPath = path.resolve(String(args["service-account"]));
+			const jwt = await loadServiceAccount(saPath).catch((e) => {
+				logger.error(`Service-account load failed: ${e.message}`);
+				process.exit(1);
+			});
+			await jwt.authorize().catch((e) => {
+				logger.error(`Service-account auth failed: ${e.message}`);
+				process.exit(1);
+			});
+			const config = await loadConfig();
+			config.serviceAccountPath = saPath;
+			await saveConfig(config);
+			logger.success(`Service-account verified: ${jwt.email ?? "OK"}`);
+			logger.info(`Saved path to config: ${saPath}`);
+			return;
+		}
+		if (args.force) await clearTokens();
+		const oauth = await getAuth({
+			interactive: true,
+			noBrowser: args.browser === false,
+			force: Boolean(args.force)
+		}).catch((e) => {
+			logger.error(`Login failed: ${e.message}`);
+			process.exit(1);
+		});
+		logger.success("Logged in");
+		await runSmokeTest(oauth).catch(() => {});
+		if (!resolveActiveProfile()) {
+			const tokens = await loadTokens();
+			const info = tokens?.access_token ? await fetchTokenInfo(tokens.access_token) : null;
+			if (info?.email) {
+				const name = profileNameFromEmail(info.email);
+				if (await adoptCurrentConfigAsProfile(name).catch(() => null)) logger.success(`Saved as profile "${name}" (active)`);
 			}
-		}),
+		}
+		if (resolveBYOK()) {
+			console.log();
+			console.log(await formatAuthProvenance());
+		}
+	}
+});
+const logoutCommand = defineCommand({
+	meta: {
+		name: "logout",
+		description: "Clear stored OAuth tokens"
+	},
+	args: { ...OUTPUT_ARGS },
+	async run({ args }) {
+		applyOutputMode(args);
+		await clearTokens();
+		const config = await loadConfig();
+		if (config.serviceAccountPath) {
+			delete config.serviceAccountPath;
+			await saveConfig(config);
+			logger.info("Cleared saved service-account path");
+		}
+	}
+});
+const scopesCommand = defineCommand({
+	meta: {
+		name: "scopes",
+		description: "Print granted OAuth scopes (one per line); exits 1 if any required scope is missing"
+	},
+	args: { ...OUTPUT_ARGS },
+	async run({ args }) {
+		const { json } = applyOutputMode(args);
+		const { liveToken, scopes, missing } = await resolveLiveAuthState();
+		if (!liveToken) {
+			if (json) console.log(JSON.stringify({
+				scopes: [],
+				missing: null
+			}, null, 2));
+			else logger.error("Not authenticated");
+			process.exit(1);
+		}
+		if (json) console.log(JSON.stringify({
+			scopes,
+			missing
+		}, null, 2));
+		else for (const s of scopes) console.log(s);
+		if (missing.length > 0) process.exit(1);
+	}
+});
+const authCommand = defineCommand({
+	meta: {
+		name: "auth",
+		description: "Manage authentication"
+	},
+	args: { ...OUTPUT_ARGS },
+	subCommands: {
+		status: statusCommand$1,
+		login: loginCommand,
+		logout: logoutCommand,
 		refresh: refreshCommand,
-		scopes: defineCommand({
-			meta: {
-				name: "scopes",
-				description: "Print granted OAuth scopes (one per line); exits 1 if any required scope is missing"
-			},
-			args: { ...OUTPUT_ARGS },
-			async run({ args }) {
-				const { json } = applyOutputMode(args);
-				const { liveToken, scopes, missing } = await resolveLiveAuthState();
-				if (!liveToken) {
-					if (json) console.log(JSON.stringify({
-						scopes: [],
-						missing: null
-					}, null, 2));
-					else logger.error("Not authenticated");
-					process.exit(1);
-				}
-				if (json) console.log(JSON.stringify({
-					scopes,
-					missing
-				}, null, 2));
-				else for (const s of scopes) console.log(s);
-				if (missing.length > 0) process.exit(1);
-			}
-		})
+		scopes: scopesCommand
+	},
+	async run({ args }) {
+		if (!noSubcommandSelected("auth", AUTH_SUBCOMMANDS)) return;
+		await runStatus(args);
 	}
 });
 const showCommand = defineCommand({
@@ -1747,7 +2044,7 @@ const configCommand = defineCommand({
 			args: { ...OUTPUT_ARGS },
 			async run({ args }) {
 				const { json } = applyOutputMode(args);
-				const { resolveDataDir } = await import("./_chunks/config.mjs").then((n) => n.t);
+				const { resolveDataDir } = await Promise.resolve().then(() => config_exports);
 				const fs = await import("node:fs/promises");
 				const config = await loadConfig();
 				const issues = [];
@@ -1834,6 +2131,20 @@ const configCommand = defineCommand({
 				if (issues.some((i) => i.level === "fail")) process.exit(1);
 			}
 		})
+	},
+	async run({ args }) {
+		if (!noSubcommandSelected("config", [
+			"show",
+			"set",
+			"unset",
+			"path",
+			"validate"
+		])) return;
+		await showCommand.run?.({
+			args,
+			cmd: showCommand,
+			rawArgs: []
+		});
 	}
 });
 const REQUIRED_SCOPES = [
@@ -2352,7 +2663,7 @@ async function dumpParquet(store, entries, outDir) {
 		const bytes = await store.engine.readObject(entry.objectKey);
 		const target = path.join(outDir, entry.objectKey);
 		await fs.mkdir(path.dirname(target), { recursive: true });
-		await fs.writeFile(target, Buffer.from(bytes));
+		await fs.writeFile(target, Buffer$1.from(bytes));
 		copied++;
 	}
 	return copied;
@@ -2414,7 +2725,7 @@ async function readUrlList(opts) {
 	if (opts.file) return (await readFile(opts.file, "utf8")).split("\n").map((l) => l.trim()).filter(Boolean);
 	const chunks = [];
 	for await (const chunk of process.stdin) chunks.push(chunk);
-	return Buffer.concat(chunks).toString("utf8").split("\n").map((l) => l.trim()).filter(Boolean);
+	return Buffer$1.concat(chunks).toString("utf8").split("\n").map((l) => l.trim()).filter(Boolean);
 }
 const inspectSubCommand = defineCommand({
 	meta: {
@@ -3106,157 +3417,6 @@ const indexingCommand = defineCommand({
 		"quota": quotaCommand
 	}
 });
-const ENV_LINE_RE = /^([^=]+)=(.*)$/;
-async function promptDataDir(existing) {
-	const fallback = existing ?? defaultDataDir();
-	const answer = await text({
-		message: "Where should Parquet data be stored?",
-		placeholder: fallback,
-		defaultValue: fallback
-	});
-	if (isCancel(answer)) process.exit(1);
-	return String(answer) || fallback;
-}
-async function loadEnvFile() {
-	const envPath = path.join(process.cwd(), ".env");
-	const content = await fs.readFile(envPath, "utf-8").catch(() => null);
-	if (!content) return null;
-	const env = {};
-	for (const line of content.split("\n")) {
-		const trimmed = line.trim();
-		if (!trimmed || trimmed.startsWith("#")) continue;
-		const match = trimmed.match(ENV_LINE_RE);
-		if (match) {
-			const key = match[1].trim();
-			let value = match[2].trim();
-			if (value.startsWith("\"") && value.endsWith("\"") || value.startsWith("'") && value.endsWith("'")) value = value.slice(1, -1);
-			env[key] = value;
-		}
-	}
-	return env;
-}
-const initCommand = defineCommand({
-	meta: {
-		name: "init",
-		description: "Set up GSCDump authentication"
-	},
-	args: {
-		"force": {
-			type: "boolean",
-			alias: "f",
-			description: "Force re-initialization"
-		},
-		"no-store": {
-			type: "boolean",
-			default: false,
-			description: "Skip dataDir prompt (auth-only setup)"
-		},
-		...OUTPUT_ARGS
-	},
-	async run({ args }) {
-		applyOutputMode(args);
-		const config = await loadConfig();
-		if (config.clientId && config.clientSecret && !args.force) {
-			logger.info("Already configured");
-			logger.info("Run with --force to reconfigure");
-			return;
-		}
-		const byok = resolveBYOK();
-		if (byok) {
-			const dataDir = args["no-store"] ? void 0 : await promptDataDir(config.dataDir);
-			await saveConfig({
-				...config,
-				dataDir: dataDir ?? config.dataDir
-			});
-			logger.success(`BYOK detected (${typeof byok === "string" ? "access-token" : "refresh-token"}) — auth setup skipped`);
-			logger.success("Setup complete! Run gscdump to get started.");
-			return;
-		}
-		const envFile = await loadEnvFile();
-		const envCid = envFile?.GSC_CLIENT_ID ?? envFile?.GOOGLE_CLIENT_ID;
-		const envSec = envFile?.GSC_CLIENT_SECRET ?? envFile?.GOOGLE_CLIENT_SECRET;
-		const envRef = envFile?.GSC_REFRESH_TOKEN ?? envFile?.GOOGLE_REFRESH_TOKEN;
-		const envAcc = envFile?.GSC_ACCESS_TOKEN ?? envFile?.GOOGLE_ACCESS_TOKEN;
-		if (envCid && envSec && envRef) {
-			logger.info("Found .env file with credentials");
-			process.env.GOOGLE_CLIENT_ID = envCid;
-			process.env.GOOGLE_CLIENT_SECRET = envSec;
-			process.env.GOOGLE_REFRESH_TOKEN = envRef;
-			if (envAcc) process.env.GOOGLE_ACCESS_TOKEN = envAcc;
-			await saveConfig({
-				...config,
-				clientId: envCid,
-				clientSecret: envSec,
-				dataDir: config.dataDir ?? defaultDataDir()
-			});
-			const creds = (await authenticate({
-				clientId: envCid,
-				clientSecret: envSec
-			}, false)).credentials;
-			if (creds.access_token) await saveTokens({
-				access_token: creds.access_token,
-				refresh_token: creds.refresh_token || envRef,
-				expiry_date: creds.expiry_date
-			});
-			console.log();
-			logger.success("Setup complete using .env credentials! Run gscdump to get started.");
-			return;
-		}
-		console.log();
-		console.log("  \x1B[1mWelcome to GSCDump!\x1B[0m");
-		console.log("  \x1B[90mGoogle Search Console data extraction CLI\x1B[0m");
-		console.log();
-		const dataDir = args["no-store"] ? void 0 : await promptDataDir(config.dataDir);
-		const credentials = await getAuthCredentials(true);
-		await saveConfig({
-			...config,
-			...dataDir ? { dataDir } : {},
-			clientId: credentials.clientId,
-			clientSecret: credentials.clientSecret
-		});
-		await smokeTest(await authenticate(credentials, true));
-		await maybeWriteEnvFile(credentials.clientId, credentials.clientSecret);
-		console.log();
-		logger.success("Setup complete! Run gscdump to get started.");
-	}
-});
-async function smokeTest(oauth) {
-	const sites = await googleSearchConsole(oauth).sites().catch((e) => e);
-	if (sites instanceof Error) {
-		logger.warn(`Smoke test failed: ${sites.message}`);
-		logger.info("Auth saved, but verify scopes via `gscdump auth status` / `gscdump doctor`.");
-		return;
-	}
-	logger.success(`Verified: ${sites.length} GSC site(s) accessible`);
-}
-async function maybeWriteEnvFile(clientId, clientSecret) {
-	const tokens = await loadTokens();
-	if (!tokens?.refresh_token) return;
-	const wants = await confirm({
-		message: "Write a `.env` file with these credentials? (handy for CI / other machines)",
-		initialValue: false
-	});
-	if (isCancel(wants) || !wants) return;
-	const envPath = path.join(process.cwd(), ".env");
-	if (await fs.stat(envPath).then(() => true).catch(() => false)) {
-		const overwrite = await confirm({
-			message: `${displayPath(envPath)} exists. Overwrite?`,
-			initialValue: false
-		});
-		if (isCancel(overwrite) || !overwrite) {
-			logger.info(`Skipped — keep credentials at ${displayPath(envPath)} manually if needed`);
-			return;
-		}
-	}
-	const content = [
-		`GSC_CLIENT_ID=${clientId}`,
-		`GSC_CLIENT_SECRET=${clientSecret}`,
-		`GSC_REFRESH_TOKEN=${tokens.refresh_token}`,
-		""
-	].join("\n");
-	await fs.writeFile(envPath, content, { mode: 384 });
-	logger.success(`Wrote ${displayPath(envPath)}`);
-}
 function verdictTone(verdict) {
 	if (verdict === "PASS") return "\x1B[32m";
 	if (verdict === "NEUTRAL" || verdict === "PARTIAL") return "\x1B[33m";
@@ -3505,6 +3665,7 @@ const DIMENSIONS = [
 	"page",
 	"query",
 	"date",
+	"hour",
 	"country",
 	"device",
 	"searchAppearance"
@@ -3513,6 +3674,7 @@ const DIM_COLUMNS = {
 	page,
 	query,
 	date,
+	hour,
 	country,
 	device,
 	searchAppearance
@@ -3570,7 +3732,7 @@ async function runLiveQuery(client, siteUrl, opts) {
 		dimensions: opts.dimensions,
 		rowLimit: opts.rowLimit
 	};
-	if (opts.searchType) baseBody.searchType = opts.searchType;
+	if (opts.searchType) baseBody.type = opts.searchType;
 	if (opts.dataState) baseBody.dataState = opts.dataState;
 	if (opts.aggregationType) baseBody.aggregationType = opts.aggregationType;
 	if (opts.dimensionFilter) {
@@ -3756,7 +3918,7 @@ const queryCommand = defineCommand({
 					dimensions: dimNames,
 					rowLimit
 				};
-				if (searchType) body.searchType = searchType;
+				if (searchType) body.type = searchType;
 				if (dataState) body.dataState = dataState;
 				if (aggregationType) body.aggregationType = aggregationType;
 				if (dimensionFilter) body.dimensionFilterGroups = filterToGroups(dimensionFilter);
@@ -4215,69 +4377,70 @@ const reportCommand = defineCommand({
 		...Object.fromEntries(REPORT_IDS.map((id) => [id, makeReportCommand(defaultReportRegistry.getReport(id))]))
 	}
 });
+const listCommand$1 = defineCommand({
+	meta: {
+		name: "list",
+		description: "List sitemaps for a site"
+	},
+	args: {
+		...OUTPUT_ARGS,
+		site: {
+			type: "string",
+			alias: "s",
+			description: "Site URL (e.g., sc-domain:example.com or https://example.com/)"
+		},
+		pending: {
+			type: "boolean",
+			default: false,
+			description: "Show only sitemaps with isPending=true"
+		},
+		errored: {
+			type: "boolean",
+			default: false,
+			description: "Show only sitemaps with errors > 0"
+		}
+	},
+	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);
+		let sitemaps = (await ctx.client.sitemaps.list(siteUrl).catch(gscErrorHandler)).map((sm) => ({
+			path: sm.path,
+			type: sm.type || void 0,
+			isPending: sm.isPending || false,
+			errors: Number(sm.errors) || 0,
+			warnings: Number(sm.warnings) || 0,
+			lastDownloaded: sm.lastDownloaded || null,
+			lastSubmitted: sm.lastSubmitted || null
+		}));
+		if (args.pending) sitemaps = sitemaps.filter((sm) => sm.isPending);
+		if (args.errored) sitemaps = sitemaps.filter((sm) => sm.errors > 0);
+		if (json) {
+			console.log(JSON.stringify(sitemaps, null, 2));
+			return;
+		}
+		if (sitemaps.length === 0) {
+			logger.warn("No sitemaps found");
+			return;
+		}
+		logger.success(`Found ${sitemaps.length} sitemaps:`);
+		console.log();
+		for (const sm of sitemaps) {
+			const pending = sm.isPending ? " \x1B[33m(pending)\x1B[0m" : "";
+			const errors = sm.errors ? ` \x1B[31m${sm.errors} errors\x1B[0m` : "";
+			const warnings = sm.warnings ? ` \x1B[33m${sm.warnings} warnings\x1B[0m` : "";
+			const submitted = sm.lastSubmitted ? ` \x1B[90msubmitted ${sm.lastSubmitted}\x1B[0m` : "";
+			console.log(`  ${sm.path}${pending}${errors}${warnings}${submitted}`);
+		}
+	}
+});
 const sitemapsCommand = defineCommand({
 	meta: {
 		name: "sitemaps",
 		description: "Manage sitemaps"
 	},
 	subCommands: {
-		list: defineCommand({
-			meta: {
-				name: "list",
-				description: "List sitemaps for a site"
-			},
-			args: {
-				...OUTPUT_ARGS,
-				site: {
-					type: "string",
-					alias: "s",
-					description: "Site URL (e.g., sc-domain:example.com or https://example.com/)"
-				},
-				pending: {
-					type: "boolean",
-					default: false,
-					description: "Show only sitemaps with isPending=true"
-				},
-				errored: {
-					type: "boolean",
-					default: false,
-					description: "Show only sitemaps with errors > 0"
-				}
-			},
-			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);
-				let sitemaps = (await ctx.client.sitemaps.list(siteUrl).catch(gscErrorHandler)).map((sm) => ({
-					path: sm.path,
-					type: sm.type || void 0,
-					isPending: sm.isPending || false,
-					errors: Number(sm.errors) || 0,
-					warnings: Number(sm.warnings) || 0,
-					lastDownloaded: sm.lastDownloaded || null,
-					lastSubmitted: sm.lastSubmitted || null
-				}));
-				if (args.pending) sitemaps = sitemaps.filter((sm) => sm.isPending);
-				if (args.errored) sitemaps = sitemaps.filter((sm) => sm.errors > 0);
-				if (json) {
-					console.log(JSON.stringify(sitemaps, null, 2));
-					return;
-				}
-				if (sitemaps.length === 0) {
-					logger.warn("No sitemaps found");
-					return;
-				}
-				logger.success(`Found ${sitemaps.length} sitemaps:`);
-				console.log();
-				for (const sm of sitemaps) {
-					const pending = sm.isPending ? " \x1B[33m(pending)\x1B[0m" : "";
-					const errors = sm.errors ? ` \x1B[31m${sm.errors} errors\x1B[0m` : "";
-					const warnings = sm.warnings ? ` \x1B[33m${sm.warnings} warnings\x1B[0m` : "";
-					const submitted = sm.lastSubmitted ? ` \x1B[90msubmitted ${sm.lastSubmitted}\x1B[0m` : "";
-					console.log(`  ${sm.path}${pending}${errors}${warnings}${submitted}`);
-				}
-			}
-		}),
+		list: listCommand$1,
 		get: defineCommand({
 			meta: {
 				name: "get",
@@ -4464,6 +4627,21 @@ const sitemapsCommand = defineCommand({
 				for (const u of urls) console.log(u);
 			}
 		})
+	},
+	async run({ args }) {
+		if (!noSubcommandSelected("sitemaps", [
+			"list",
+			"get",
+			"submit",
+			"delete",
+			"discover",
+			"urls"
+		])) return;
+		await listCommand$1.run?.({
+			args,
+			cmd: listCommand$1,
+			rawArgs: []
+		});
 	}
 });
 const ALL_METHODS = [
@@ -5540,6 +5718,22 @@ const storeCommand = defineCommand({
 				console.log(`  Sync states:        ${result.syncStatesRemoved}`);
 			}
 		})
+	},
+	async run({ args }) {
+		if (!noSubcommandSelected("store", [
+			"stats",
+			"compact",
+			"gc",
+			"export",
+			"rollups",
+			"rm-site",
+			"reset"
+		])) return;
+		await statsCommand.run?.({
+			args,
+			cmd: statsCommand,
+			rawArgs: []
+		});
 	}
 });
 const DEFAULT_TABLES = [
@@ -6070,6 +6264,9 @@ runMain(defineCommand({
 		analyze: analyzeCommand,
 		report: reportCommand,
 		auth: authCommand,
+		login: loginCommand,
+		logout: logoutCommand,
+		status: statusCommand$1,
 		config: configCommand,
 		profile: profileCommand,
 		doctor: doctorCommand,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cli",
   "type": "module",
-  "version": "0.17.5",
+  "version": "0.18.0",
   "description": "CLI for Google Search Console - dump, query, and run MCP server",
   "author": {
     "name": "Harlan Wilton",
@@ -42,11 +42,11 @@
     "google-auth-library": "^10.6.2",
     "ofetch": "^1.5.1",
     "open": "^11.0.0",
-    "@gscdump/analysis": "0.17.5",
-    "@gscdump/mcp": "0.17.5",
-    "gscdump": "0.17.5",
-    "@gscdump/engine": "0.17.5",
-    "@gscdump/engine-gsc-api": "0.17.5"
+    "@gscdump/engine-gsc-api": "0.18.0",
+    "@gscdump/analysis": "0.18.0",
+    "@gscdump/mcp": "0.18.0",
+    "gscdump": "0.18.0",
+    "@gscdump/engine": "0.18.0"
   },
   "devDependencies": {
     "@duckdb/node-api": "1.5.1-r.2",

package/dist/_chunks/config.mjs

@@ -1,54 +0,0 @@
-import fs from "node:fs/promises";
-import path from "node:path";
-import os from "node:os";
-var __defProp = Object.defineProperty;
-var __exportAll = (all, no_symbols) => {
-	let target = {};
-	for (var name in all) __defProp(target, name, {
-		get: all[name],
-		enumerable: true
-	});
-	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
-	return target;
-};
-var config_exports = /* @__PURE__ */ __exportAll({
-	defaultDataDir: () => defaultDataDir,
-	getConfigDir: () => getConfigDir,
-	getConfigPath: () => getConfigPath,
-	loadConfig: () => loadConfig,
-	resolveDataDir: () => resolveDataDir,
-	saveConfig: () => saveConfig,
-	setConfigDir: () => setConfigDir
-});
-let configDir = path.join(os.homedir(), ".config", "gscdump");
-function setConfigDir(dir) {
-	configDir = dir;
-}
-function getConfigDir() {
-	return configDir;
-}
-function defaultDataDir() {
-	return path.join(os.homedir(), ".gscdump", "data");
-}
-function resolveDataDir(config) {
-	return expandTilde(config.dataDir ?? defaultDataDir());
-}
-function expandTilde(p) {
-	if (p === "~") return os.homedir();
-	if (p.startsWith("~/")) return path.join(os.homedir(), p.slice(2));
-	return p;
-}
-async function loadConfig() {
-	return fs.readFile(path.join(configDir, "config.json"), "utf-8").then((data) => JSON.parse(data)).catch(() => ({}));
-}
-async function saveConfig(config) {
-	await fs.mkdir(configDir, {
-		recursive: true,
-		mode: 448
-	});
-	await fs.writeFile(path.join(configDir, "config.json"), JSON.stringify(config, null, 2), { mode: 384 });
-}
-function getConfigPath() {
-	return path.join(configDir, "config.json");
-}
-export { loadConfig as a, setConfigDir as c, getConfigPath as i, __exportAll as l, defaultDataDir as n, resolveDataDir as o, getConfigDir as r, saveConfig as s, config_exports as t };