@vigilbase/cli 0.1.2 → 0.1.3

package/dist/commands/auth.d.ts

@@ -1,4 +1,5 @@
 import { type CommandHandler } from './helpers.js';
+export declare function readTokenFromStdin(input?: NodeJS.ReadableStream): Promise<string>;
 export declare const handleLogin: CommandHandler;
 export declare const handleLogout: CommandHandler;
 export declare const handleWhoami: CommandHandler;

package/dist/commands/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"AAgBA,OAAO,EACL,KAAK,cAAc,EAKpB,MAAM,cAAc,CAAA;AAErB,eAAO,MAAM,WAAW,EAAE,cAyIzB,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,cAU1B,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,cA+C1B,CAAA"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"AAiBA,OAAO,EAEL,KAAK,cAAc,EAKpB,MAAM,cAAc,CAAA;AAErB,wBAAsB,kBAAkB,CAAC,KAAK,GAAE,MAAM,CAAC,cAA8B,GAAG,OAAO,CAAC,MAAM,CAAC,CAYtG;AAED,eAAO,MAAM,WAAW,EAAE,cAoJzB,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,cAY1B,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,cAqD1B,CAAA"}

package/dist/commands/auth.js

@@ -1,13 +1,40 @@
 import { clearOneCredentials, getOneAccessToken, readCredentials, requestDeviceCode, waitForDeviceAuthorization, writeOneCredentials, } from '../auth/index.js';
 import { VigilbaseOneClient, ONE_AUTH_REQUIRED_TOOLS } from '../lib/one-client.js';
+import { VigilbaseApiError } from '../lib/client.js';
 import { formatUserCode, isHeadlessEnvironment, openUrlInBrowser, resolveDeviceVerificationUrl, } from '../lib/open-url.js';
 import { shouldShowProgress, startProgress } from '../lib/progress.js';
-import { ok, outputJson, outputLines, withSpinner, } from './helpers.js';
+import { assertCommandFlags, ok, outputJson, outputLines, withSpinner, } from './helpers.js';
+export async function readTokenFromStdin(input = process.stdin) {
+    if ('isTTY' in input && input.isTTY) {
+        throw new Error('--token-stdin requires piped input. Pipe the token from your secret manager to vigilbase login --token-stdin.');
+    }
+    let token = '';
+    for await (const chunk of input) {
+        token += Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk);
+        if (Buffer.byteLength(token, 'utf8') > 16384)
+            throw new Error('Token input exceeds 16 KiB.');
+    }
+    token = token.trim();
+    if (!token || /\s/.test(token))
+        throw new Error('Token input must contain exactly one nonempty token.');
+    return token;
+}
 export const handleLogin = async (ctx) => {
+    if (ctx.rest.length)
+        throw new Error('Usage: vigilbase login [--token-stdin | --token <bearer>] [--no-open]');
+    assertCommandFlags(ctx, ['token', 'isTokenStdin', 'isNoOpen']);
     if (ctx.loginHandler) {
         return ctx.loginHandler(ctx.config);
     }
-    const explicitToken = ctx.values.token?.trim() || ctx.env.VIGILBASE_ONE_TOKEN?.trim() || '';
+    if (ctx.values.isTokenStdin && (ctx.values.token !== undefined || ctx.env.VIGILBASE_ONE_TOKEN !== undefined)) {
+        throw new Error('Use --token-stdin without --token or VIGILBASE_ONE_TOKEN.');
+    }
+    const explicitToken = ctx.values.isTokenStdin
+        ? await readTokenFromStdin(ctx.stdin)
+        : ctx.values.token?.trim() || ctx.env.VIGILBASE_ONE_TOKEN?.trim() || '';
+    if (ctx.values.token !== undefined && !ctx.values.token.trim()) {
+        throw new Error('The --token value must not be empty.');
+    }
     if (explicitToken) {
         const oneClient = new VigilbaseOneClient(ctx.config, explicitToken);
         let user;
@@ -23,6 +50,9 @@ export const handleLogin = async (ctx) => {
         await writeOneCredentials(ctx.config, {
             accessToken: explicitToken,
             tokenType: 'Bearer',
+            expiresAt: typeof session.session?.expiresAt === 'string'
+                ? session.session.expiresAt
+                : undefined,
             user,
             obtainedAt: new Date().toISOString(),
         });
@@ -96,7 +126,6 @@ export const handleLogin = async (ctx) => {
     }
     await writeOneCredentials(ctx.config, {
         accessToken: token.access_token,
-        refreshToken: token.refresh_token,
         tokenType: token.token_type,
         scope: token.scope,
         expiresAt,
@@ -120,6 +149,9 @@ export const handleLogin = async (ctx) => {
     return ok();
 };
 export const handleLogout = async (ctx) => {
+    if (ctx.rest.length)
+        throw new Error('Usage: vigilbase logout');
+    assertCommandFlags(ctx, []);
     const cleared = await clearOneCredentials(ctx.config);
     if (ctx.mode === 'json') {
         outputJson(ctx, { success: true, cleared });
@@ -133,9 +165,12 @@ export const handleLogout = async (ctx) => {
     return ok();
 };
 export const handleWhoami = async (ctx) => {
+    if (ctx.rest.length)
+        throw new Error('Usage: vigilbase whoami');
+    assertCommandFlags(ctx, []);
     const credentials = await readCredentials(ctx.config);
     const accessToken = await getOneAccessToken(ctx.config);
-    let liveUser = accessToken ? (credentials.one?.user ?? null) : null;
+    let liveUser = null;
     if (accessToken) {
         try {
             const session = await withSpinner(ctx, 'Loading session', () => new VigilbaseOneClient(ctx.config, accessToken).getSession());
@@ -147,18 +182,22 @@ export const handleWhoami = async (ctx) => {
                 };
             }
         }
-        catch {
-            // Keep stored user if live session probe fails.
+        catch (error) {
+            // A rejected session is signed out. Connectivity and server failures
+            // must remain errors rather than claiming the cached session is valid.
+            if (!(error instanceof VigilbaseApiError) || ![401, 403].includes(error.status)) {
+                throw error;
+            }
         }
     }
-    const signedIn = Boolean(accessToken);
+    const signedIn = Boolean(liveUser);
     const payload = {
         authenticated: signedIn,
         oneBaseUrl: ctx.config.oneBaseUrl,
         user: liveUser,
-        expiresAt: credentials.one?.expiresAt ?? null,
-        scope: credentials.one?.scope ?? null,
-        obtainedAt: credentials.one?.obtainedAt ?? null,
+        expiresAt: signedIn ? credentials.one?.expiresAt ?? null : null,
+        scope: signedIn ? credentials.one?.scope ?? null : null,
+        obtainedAt: signedIn ? credentials.one?.obtainedAt ?? null : null,
         authRequiredTools: signedIn ? [...ONE_AUTH_REQUIRED_TOOLS] : [],
     };
     if (ctx.mode === 'json') {

package/dist/commands/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"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"}

package/dist/commands/billing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"billing.d.ts","sourceRoot":"","sources":["../../src/commands/billing.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,cAAc,EAKpB,MAAM,cAAc,CAAA;AAErB,eAAO,MAAM,aAAa,EAAE,cAwD3B,CAAA"}
+{"version":3,"file":"billing.d.ts","sourceRoot":"","sources":["../../src/commands/billing.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,cAAc,EAKpB,MAAM,cAAc,CAAA;AAErB,eAAO,MAAM,aAAa,EAAE,cA0D3B,CAAA"}

package/dist/commands/billing.js

@@ -1,8 +1,12 @@
+import { validateArguments } from './legacy-validation.js';
 import { openUrlInBrowser } from '../lib/open-url.js';
 import { asRecord, ok, outputJson, requireOneClient, withSpinner, } from './helpers.js';
 export const handleBilling = async (ctx) => {
-    const one = await requireOneClient(ctx);
     const subcommand = (ctx.rest[0] ?? 'summary').toLowerCase();
+    if (!['summary', 'show', 'status', 'portal', 'open'].includes(subcommand))
+        throw new Error('Usage: vigilbase billing [summary|portal]');
+    validateArguments(ctx, ctx.rest[0] === undefined ? 0 : 1, ['portal', 'open'].includes(subcommand) ? ['isNoOpen'] : []);
+    const one = await requireOneClient(ctx);
     if (subcommand === 'summary' ||
         subcommand === 'show' ||
         subcommand === 'status') {

package/dist/commands/billing.js.map

@@ -1 +1 @@
-{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../src/commands/billing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../src/commands/billing.ts"],"names":[],"mappings":"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"}

package/dist/commands/cloudflare.d.ts

@@ -1,3 +1,4 @@
 import { type CommandHandler } from './helpers.js';
+export declare const CLOUDFLARE_HELP = "Usage: vigilbase cf <command> [options]\nAlias: vigilbase cloudflare\n\nInventory and workspace:\n  zones                         List zones (default); --customer-id, --account-id, --zone-id\n  zone <zone-id>                Zone detail; --customer-id selects live details, optional --account-id\n  accounts                     List accessible accounts; --customer-id, --account-id\n  account <account-id>          Stored account detail; --customer-id\n  workspace [section]          Workspace bootstrap or section; --customer-id, --account-id, --zone-id\n    Sections: overview, reports, zones, rule-analyzer, accounts, checkups, settings\n\nZone reads (optional --customer-id; IDs can use --zone-id):\n  dns <zone-id>                 DNS records, TTL and proxy state\n  waf <zone-id>                 WAF rules, expressions, analytics and suggestions\n  speed-settings <zone-id>      Performance settings (internal users only)\n\nAccount reads (optional --customer-id; IDs can use --account-id):\n  audit-logs <account-id>       Latest provider audit events (up to 100; service-read permission)\n  zero-trust <account-id>       Users, Access applications, tunnels and authentication analytics\n  developer-platform <account-id>  Workers, Workers analytics and Pages\n  magic-transit <account-id>    Prefixes, routes and traffic analytics\n    Zero Trust, Developer Platform and Magic Transit require deployment-read permission.\n\nAnalytics and checkups:\n  analytics --customer-id <uuid> [--account-id <id> | --zone-id <id>] [--days 1..30]\n    Default 7 days; live zone analytics uses the most recent 23 hours.\n  checkup [status]             Latest completed checkup; --customer-id, --account-id\n  checkup start                Start and persist a scan; --customer-id, --account-id\n  checkup progress <run-uuid>   Read saved progress once\n  checkup result <run-uuid>     Read the stored Cloudflare checkup result\n    checkups aliases checkup; list/show alias status; run aliases start.\n\nCommon options: --json, --one-url <origin>, --timeout <milliseconds>, --help\nCustomer IDs are UUIDs; account and zone IDs are 32 hexadecimal characters.\nOne login, tenant bindings and permissions apply to every command.\nCheckup start creates a scan run. These commands do not edit provider configuration.\nSee CLOUDFLARE.md for full grammar, API mapping, data limits and examples.";
 export declare const handleCloudflare: CommandHandler;
 //# sourceMappingURL=cloudflare.d.ts.map

package/dist/commands/cloudflare.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cloudflare.d.ts","sourceRoot":"","sources":["../../src/commands/cloudflare.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EAKpB,MAAM,cAAc,CAAA;AAErB,eAAO,MAAM,gBAAgB,EAAE,cAsE9B,CAAA"}
+{"version":3,"file":"cloudflare.d.ts","sourceRoot":"","sources":["../../src/commands/cloudflare.ts"],"names":[],"mappings":"AAOA,OAAO,EAKL,KAAK,cAAc,EAKpB,MAAM,cAAc,CAAA;AAKrB,eAAO,MAAM,eAAe,+0EAoC+C,CAAA;AAiC3E,eAAO,MAAM,gBAAgB,EAAE,cAmO9B,CAAA"}

package/dist/commands/cloudflare.js

@@ -1,53 +1,341 @@
-import { asArray, asRecord, ok, outputJson, requireOneClient, withSpinner, } from './helpers.js';
+import { z } from 'zod';
+import { CloudflareClient, accountResourceSchema, cloudflareScopeSchema, workspaceSectionSchema, } from '../lib/cloudflare-client.js';
+import { assertCommandFlags, asArray, asRecord, ok, outputJson, requireOneClient, withSpinner, } from './helpers.js';
+const usage = 'Usage: vigilbase cf [zones|zone <id>|accounts|account <id>|workspace [section]|dns <zone-id>|waf <zone-id>|speed-settings <zone-id>|audit-logs <account-id>|zero-trust <account-id>|developer-platform <account-id>|magic-transit <account-id>|analytics|checkup] [--customer-id …] [--account-id …] [--json]';
+const checkupUsage = 'Usage: vigilbase cf checkup [status|start|progress <run-id>|result <run-id>] [--customer-id …] [--account-id …] [--json]';
+export const CLOUDFLARE_HELP = `Usage: vigilbase cf <command> [options]
+Alias: vigilbase cloudflare
+
+Inventory and workspace:
+  zones                         List zones (default); --customer-id, --account-id, --zone-id
+  zone <zone-id>                Zone detail; --customer-id selects live details, optional --account-id
+  accounts                     List accessible accounts; --customer-id, --account-id
+  account <account-id>          Stored account detail; --customer-id
+  workspace [section]          Workspace bootstrap or section; --customer-id, --account-id, --zone-id
+    Sections: overview, reports, zones, rule-analyzer, accounts, checkups, settings
+
+Zone reads (optional --customer-id; IDs can use --zone-id):
+  dns <zone-id>                 DNS records, TTL and proxy state
+  waf <zone-id>                 WAF rules, expressions, analytics and suggestions
+  speed-settings <zone-id>      Performance settings (internal users only)
+
+Account reads (optional --customer-id; IDs can use --account-id):
+  audit-logs <account-id>       Latest provider audit events (up to 100; service-read permission)
+  zero-trust <account-id>       Users, Access applications, tunnels and authentication analytics
+  developer-platform <account-id>  Workers, Workers analytics and Pages
+  magic-transit <account-id>    Prefixes, routes and traffic analytics
+    Zero Trust, Developer Platform and Magic Transit require deployment-read permission.
+
+Analytics and checkups:
+  analytics --customer-id <uuid> [--account-id <id> | --zone-id <id>] [--days 1..30]
+    Default 7 days; live zone analytics uses the most recent 23 hours.
+  checkup [status]             Latest completed checkup; --customer-id, --account-id
+  checkup start                Start and persist a scan; --customer-id, --account-id
+  checkup progress <run-uuid>   Read saved progress once
+  checkup result <run-uuid>     Read the stored Cloudflare checkup result
+    checkups aliases checkup; list/show alias status; run aliases start.
+
+Common options: --json, --one-url <origin>, --timeout <milliseconds>, --help
+Customer IDs are UUIDs; account and zone IDs are 32 hexadecimal characters.
+One login, tenant bindings and permissions apply to every command.
+Checkup start creates a scan run. These commands do not edit provider configuration.
+See CLOUDFLARE.md for full grammar, API mapping, data limits and examples.`;
+function validate(schema, input) {
+    const result = schema.safeParse(input);
+    if (!result.success)
+        throw new Error(result.error.issues.map((issue) => issue.message).join(' '));
+    return result.data;
+}
+function dataOf(payload) {
+    return asRecord(payload.data) ?? payload;
+}
+function writeLine(ctx, value) {
+    // DNS contents, rule expressions, and evidence can contain terminal controls.
+    ctx.writer.stdout(value.replace(/[\u0000-\u001f\u007f-\u009f]/g, ' '));
+}
+function fields(ctx, data) {
+    for (const [key, value] of Object.entries(data)) {
+        if (value === undefined || value === null)
+            continue;
+        writeLine(ctx, `${key.padEnd(20)} ${typeof value === 'object' ? JSON.stringify(value) : String(value)}`);
+    }
+}
+function zones(ctx, values) {
+    const items = asArray(values).map(asRecord).filter((item) => item !== null);
+    if (!items.length)
+        writeLine(ctx, 'No Cloudflare zones.');
+    for (const zone of items) {
+        const plan = zone.planName ?? zone.plan_name ?? asRecord(zone.plan)?.name;
+        writeLine(ctx, `${String(zone.id ?? zone.zone_id)}  ${String(zone.name ?? zone.zone_name).padEnd(28)} ${String(zone.status ?? '-')}${plan ? `  ${String(plan)}` : ''}`);
+    }
+}
 export const handleCloudflare = async (ctx) => {
-    const one = await requireOneClient(ctx);
+    assertCommandFlags(ctx, ['customer-id', 'account-id', 'zone-id', 'days']);
     const subcommand = (ctx.rest[0] ?? 'zones').toLowerCase();
-    if (subcommand === 'zones' || subcommand === 'zone') {
-        const payload = await withSpinner(ctx, 'Loading Cloudflare zones', () => one.getCloudflareZones());
-        if (ctx.mode === 'json') {
+    const scope = validate(cloudflareScopeSchema, {
+        customerId: ctx.values['customer-id'],
+        accountId: ctx.values['account-id'],
+        zoneId: ctx.values['zone-id'],
+    });
+    if (ctx.values.days !== undefined && subcommand !== 'analytics')
+        throw new Error('--days is supported only by cf analytics.');
+    if (scope.accountId && ['dns', 'waf', 'speed-settings'].includes(subcommand))
+        throw new Error(`cf ${subcommand} accepts a zone ID and --customer-id; --account-id is not supported.`);
+    if (scope.zoneId && ['accounts', 'account', ...accountResourceSchema.options, 'checkup', 'checkups'].includes(subcommand))
+        throw new Error(`cf ${subcommand} does not support --zone-id.`);
+    const args = ctx.rest.slice(1);
+    const noExtraArgs = (count, message = usage) => {
+        if (args.length > count)
+            throw new Error(message);
+    };
+    const emit = (payload, render) => {
+        if (payload.success === false)
+            throw new Error('Cloudflare request failed.');
+        if (ctx.mode === 'json')
             outputJson(ctx, payload);
-            return ok();
+        else
+            render(dataOf(payload));
+        return ok();
+    };
+    // Validate commands before requesting credentials or making API calls.
+    if (!['zones', 'zone', 'accounts', 'workspace', 'dns', 'waf', 'speed-settings', 'account', ...accountResourceSchema.options, 'analytics', 'checkup', 'checkups'].includes(subcommand)) {
+        throw new Error(usage);
+    }
+    let zoneId;
+    let accountId;
+    const accountResource = accountResourceSchema.safeParse(subcommand);
+    if (accountResource.success || subcommand === 'account') {
+        noExtraArgs(1);
+        if (args[0] && scope.accountId && args[0] !== scope.accountId)
+            throw new Error('The positional account ID and --account-id must match.');
+        accountId = args[0] ?? scope.accountId;
+        if (!accountId)
+            throw new Error(`Usage: vigilbase cf ${subcommand} <account-id> [--customer-id …] [--json]`);
+        validate(cloudflareScopeSchema, { accountId });
+    }
+    else if (['dns', 'waf', 'zone', 'speed-settings'].includes(subcommand)) {
+        noExtraArgs(1);
+        if (args[0] && scope.zoneId && args[0] !== scope.zoneId)
+            throw new Error('The positional zone ID and --zone-id must match.');
+        zoneId = args[0] ?? scope.zoneId;
+        // Preserve the historical `cf zone` alias for the zone inventory.
+        if (subcommand !== 'zone' && !zoneId)
+            throw new Error(`Usage: vigilbase cf ${subcommand} <zone-id> [--customer-id …] [--json]`);
+        if (zoneId)
+            validate(cloudflareScopeSchema, { zoneId });
+    }
+    else if (!['workspace', 'checkup', 'checkups'].includes(subcommand)) {
+        noExtraArgs(0);
+    }
+    const section = subcommand === 'workspace'
+        ? (noExtraArgs(1), args[0] ? validate(workspaceSectionSchema, args[0]) : undefined)
+        : undefined;
+    let days = 7;
+    if (subcommand === 'analytics') {
+        if (!scope.customerId)
+            throw new Error('Cloudflare analytics requires --customer-id <uuid>. Find it with `vigilbase cf accounts --json`.');
+        if (scope.zoneId && scope.accountId)
+            throw new Error('Choose either --zone-id or --account-id for analytics.');
+        days = validate(z.coerce.number().int().min(1).max(30), ctx.values.days ?? 7);
+    }
+    const action = (args[0] ?? 'status').toLowerCase();
+    let runId;
+    if (subcommand === 'checkup' || subcommand === 'checkups') {
+        if (['progress', 'result'].includes(action)) {
+            noExtraArgs(2, checkupUsage);
+            runId = validate(z.string().uuid('A checkup run UUID is required.'), args[1]);
+            if (scope.customerId || scope.accountId)
+                throw new Error(`cf checkup ${action} is scoped by run ID and does not accept --customer-id or --account-id.`);
+        }
+        else if (['status', 'list', 'show', 'start', 'run'].includes(action)) {
+            noExtraArgs(1, checkupUsage);
+        }
+        else
+            throw new Error(checkupUsage);
+    }
+    const one = await requireOneClient(ctx);
+    const cloudflare = new CloudflareClient(one);
+    if (subcommand === 'speed-settings') {
+        const payload = await withSpinner(ctx, 'Loading Cloudflare speed settings', () => cloudflare.speedSettings(zoneId, scope.customerId));
+        return emit(payload, (data) => {
+            if (!Object.keys(data).length)
+                writeLine(ctx, 'No speed settings returned; provider availability or permissions may limit this view.');
+            else
+                fields(ctx, data);
+        });
+    }
+    if (accountResource.success) {
+        const payload = await withSpinner(ctx, `Loading Cloudflare ${subcommand}`, () => cloudflare.accountResource(accountResource.data, accountId, scope.customerId));
+        return emit(payload, (data) => {
+            if (subcommand === 'audit-logs') {
+                const logs = asArray(data.logs);
+                if (!logs.length)
+                    writeLine(ctx, 'No audit logs returned; provider availability or permissions may limit this view.');
+                for (const raw of logs) {
+                    const log = asRecord(raw);
+                    if (!log)
+                        continue;
+                    const action = asRecord(log.action);
+                    const actor = asRecord(log.actor);
+                    const resource = asRecord(log.resource);
+                    writeLine(ctx, `${String(log.id ?? '-')}  ${String(log.when ?? '-')}  ${String(action?.type ?? '-')}  ${action?.result === true ? 'success' : action?.result === false ? 'failed' : '-'}  ${String(actor?.email ?? actor?.id ?? '-')}  ${String(resource?.type ?? '-')} ${String(resource?.id ?? '-')}`);
+                }
+            }
+            else
+                fields(ctx, data);
+        });
+    }
+    if (subcommand === 'account') {
+        const payload = await withSpinner(ctx, 'Loading Cloudflare account', () => cloudflare.workspace({ ...scope, accountId }));
+        if (payload.success === false)
+            return emit(payload, () => { });
+        const matches = asArray(dataOf(payload).accounts).map(asRecord).filter((item) => item?.id === accountId);
+        if (!matches.length)
+            throw new Error('Cloudflare account not found in the selected workspace.');
+        const customerIds = new Set(matches.map((item) => item?.customerId));
+        if (customerIds.size > 1)
+            throw new Error('This Cloudflare account is linked to multiple customers. Specify --customer-id.');
+        const account = matches.find((item) => item?.status === 'active' || item?.status === 'trialing') ?? matches[0];
+        return emit({ success: true, data: account }, (data) => fields(ctx, data));
+    }
+    if (subcommand === 'zones' || subcommand === 'zone') {
+        if (zoneId && scope.customerId) {
+            const payload = await withSpinner(ctx, 'Loading live Cloudflare zone', () => cloudflare.zoneDetail(scope.customerId, zoneId));
+            if (payload.success === false)
+                return emit(payload, () => { });
+            const zone = dataOf(payload);
+            if (zone.id !== zoneId)
+                throw new Error('The server returned a different Cloudflare zone.');
+            if (scope.accountId && asRecord(zone.account)?.id !== scope.accountId)
+                throw new Error('Cloudflare zone does not belong to the selected account.');
+            return emit(payload, (data) => fields(ctx, data));
         }
-        const zones = asArray(payload.zones);
-        if (!zones.length) {
-            ctx.writer.stdout('No Cloudflare zones.');
-            return ok();
+        let payload = await withSpinner(ctx, 'Loading Cloudflare zones', () => scope.customerId || scope.accountId || scope.zoneId || zoneId
+            ? cloudflare.workspace({ ...scope, zoneId: zoneId ?? scope.zoneId }, 'zones')
+            : one.getCloudflareZones());
+        if (payload.success === false)
+            return emit(payload, () => { });
+        if (scope.accountId || scope.zoneId) {
+            const data = dataOf(payload);
+            const selectedZones = asArray(data.zones).filter((raw) => {
+                const zone = asRecord(raw);
+                return zone && (!scope.accountId || (zone.accountId ?? zone.account_id ?? zone.cloudflare_account_id) === scope.accountId)
+                    && (!scope.zoneId || (zone.id ?? zone.zone_id) === scope.zoneId);
+            });
+            payload = payload.data ? { ...payload, data: { ...data, zones: selectedZones } } : { ...payload, zones: selectedZones };
         }
-        for (const raw of zones) {
-            const zone = asRecord(raw);
+        if (zoneId) {
+            const zone = asArray(dataOf(payload).zones).map(asRecord).find((item) => (item?.id ?? item?.zone_id) === zoneId);
             if (!zone)
-                continue;
-            ctx.writer.stdout(`${String(zone.name || zone.id).padEnd(28)} ${String(zone.status || '-')}${zone.planName ? `  ${String(zone.planName)}` : ''}`);
+                throw new Error('Cloudflare zone not found in the selected workspace.');
+            return emit({ success: true, data: zone }, (data) => fields(ctx, data));
         }
-        return ok();
+        return emit(payload, (data) => zones(ctx, data.zones));
     }
-    if (subcommand === 'checkup' || subcommand === 'checkups') {
-        const action = (ctx.rest[1] ?? 'status').toLowerCase();
-        const accountId = ctx.values['account-id'];
-        if (action === 'status' || action === 'list' || action === 'show') {
-            const payload = await withSpinner(ctx, 'Loading Cloudflare checkup', () => one.getCloudflareCheckups({ accountId }));
-            if (ctx.mode === 'json') {
-                outputJson(ctx, payload);
-                return ok();
-            }
-            const data = asRecord(payload.data) || payload;
-            ctx.writer.stdout(`checkup    ${String(data.status || data.success || 'ok')}`);
-            if (data.grade)
-                ctx.writer.stdout(`grade      ${String(data.grade)}`);
-            return ok();
+    if (subcommand === 'accounts' || subcommand === 'workspace') {
+        let payload = await withSpinner(ctx, 'Loading Cloudflare workspace', () => cloudflare.workspace(scope, section));
+        if (subcommand === 'accounts' && scope.accountId) {
+            const data = dataOf(payload);
+            const accounts = asArray(data.accounts).filter((raw) => asRecord(raw)?.id === scope.accountId);
+            payload = { ...payload, data: { ...data, accounts } };
         }
-        if (action === 'start' || action === 'run') {
-            const payload = await withSpinner(ctx, 'Starting Cloudflare checkup', () => one.startCloudflareCheckup({ accountId }));
-            if (ctx.mode === 'json') {
-                outputJson(ctx, payload);
-                return ok();
+        return emit(payload, (data) => {
+            if (subcommand === 'accounts') {
+                const accounts = asArray(data.accounts);
+                if (!accounts.length)
+                    writeLine(ctx, 'No Cloudflare accounts.');
+                for (const raw of accounts) {
+                    const account = asRecord(raw);
+                    if (account)
+                        writeLine(ctx, `${String(account.id)}  ${String(account.name).padEnd(28)} ${String(account.status)}  ${String(account.zoneCount ?? 0)} zones${account.customerId ? `  customer ${String(account.customerId)}` : ''}`);
+                }
             }
-            const data = asRecord(payload.data) || payload;
-            ctx.writer.stdout(`started    ${String(data.toolRunId || data.id || 'ok')}  ${String(data.status || 'running')}`);
-            return ok();
-        }
-        throw new Error('Usage: vigilbase cf checkup [status|start] [--account-id …] [--json]');
+            else
+                fields(ctx, data);
+        });
     }
-    throw new Error('Usage: vigilbase cf [zones|checkup] [--json]');
+    if (subcommand === 'dns' || subcommand === 'waf') {
+        const payload = await withSpinner(ctx, `Loading Cloudflare ${subcommand.toUpperCase()}`, () => cloudflare.zoneRecords(subcommand, zoneId, scope.customerId));
+        return emit(payload, (data) => {
+            const records = asArray(data[subcommand === 'dns' ? 'records' : 'rules']);
+            if (!records.length)
+                writeLine(ctx, `No ${subcommand === 'dns' ? 'DNS records' : 'WAF rules'}.`);
+            for (const raw of records) {
+                const record = asRecord(raw);
+                if (!record)
+                    continue;
+                if (subcommand === 'dns') {
+                    writeLine(ctx, `${String(record.id)}  ${String(record.type).padEnd(6)} ${String(record.name).padEnd(28)} ${String(record.content)}  TTL ${String(record.ttl)}  ${record.proxied ? 'proxied' : 'DNS only'}`);
+                }
+                else {
+                    writeLine(ctx, `${String(record.id)}  ${String(record.action).padEnd(18)} ${record.paused ? 'paused' : 'active'}  ${String(record.description ?? '')}`);
+                    const expression = asRecord(record.filter)?.expression;
+                    if (expression)
+                        writeLine(ctx, `  ${String(expression)}`);
+                }
+            }
+            if (subcommand === 'waf') {
+                writeLine(ctx, `Rule analytics: ${data.analyticsAvailable ? 'available' : 'unavailable'}`);
+                for (const raw of asArray(data.suggestions)) {
+                    const suggestion = asRecord(raw);
+                    if (suggestion)
+                        writeLine(ctx, `[${String(suggestion.severity)}] ${String(suggestion.title)}: ${String(suggestion.recommendation)}`);
+                }
+            }
+        });
+    }
+    if (subcommand === 'analytics') {
+        const payload = await withSpinner(ctx, 'Loading Cloudflare analytics', () => cloudflare.analytics(scope, days));
+        return emit(payload, (data) => {
+            if (scope.zoneId)
+                writeLine(ctx, 'Live zone analytics use the most recent 23 hours; stored usage may cover less.');
+            fields(ctx, asRecord(data.analytics) ?? data);
+        });
+    }
+    if (action === 'progress') {
+        const payload = await withSpinner(ctx, 'Loading Cloudflare checkup progress', () => cloudflare.checkupProgress(runId));
+        return emit(payload, (data) => {
+            writeLine(ctx, `checkup    ${String(data.status)}  ${String(data.progressPct ?? 0)}%`);
+            for (const raw of asArray(data.events)) {
+                const event = asRecord(raw);
+                if (event)
+                    writeLine(ctx, `${String(event.createdAt ?? '')}  ${String(event.message ?? '')}`);
+            }
+            if (data.errorMessage)
+                writeLine(ctx, `error      ${String(data.errorMessage)}`);
+        });
+    }
+    if (action === 'result') {
+        const payload = await withSpinner(ctx, 'Loading Cloudflare checkup result', () => one.getToolRun(runId));
+        const run = dataOf(payload);
+        if (run.tool_name !== 'cloudflare-checkup')
+            throw new Error('This run is not a Cloudflare checkup.');
+        return emit(payload, (data) => {
+            writeLine(ctx, `checkup    ${String(data.status)}`);
+            if (data.grade)
+                writeLine(ctx, `grade      ${String(data.grade)}  ${String(data.grade_score ?? '')}`);
+            if (data.results)
+                fields(ctx, asRecord(data.results) ?? { results: data.results });
+            else
+                writeLine(ctx, 'No result is available yet.');
+        });
+    }
+    const isStart = action === 'start' || action === 'run';
+    const payload = await withSpinner(ctx, isStart ? 'Starting Cloudflare checkup' : 'Loading Cloudflare checkup', () => cloudflare.checkup(scope, isStart));
+    return emit(payload, (data) => {
+        if (isStart) {
+            writeLine(ctx, `started    ${String(data.toolRunId ?? data.id ?? 'ok')}  ${String(data.status ?? 'running')}`);
+            return;
+        }
+        const run = asRecord(data.latestRun);
+        const report = asRecord(data.report);
+        writeLine(ctx, `checkup    ${data.requiresSetup ? 'setup required' : String(run?.status ?? (report ? 'completed' : 'no completed runs'))}`);
+        if (run?.id)
+            writeLine(ctx, `run        ${String(run.id)}`);
+        if (run?.grade ?? report?.grade)
+            writeLine(ctx, `grade      ${String(run?.grade ?? report?.grade)}`);
+        if (report)
+            fields(ctx, report);
+    });
 };
 //# sourceMappingURL=cloudflare.js.map