checkly 9.5.0 → 10.0.0-prerelease-4f88d60

package/dist/auth/index.js

@@ -1,18 +1,25 @@
 import axios from 'axios';
-import * as os from 'os';
 import * as http from 'http';
 import * as crypto from 'crypto';
-import { jwtDecode } from 'jwt-decode';
-import { getDefaults as getApiDefaults } from '../rest/api.js';
-import { assignProxy } from '../services/proxy.js';
 import * as fs from 'fs';
 import * as path from 'path';
 import { fileURLToPath } from 'node:url';
+import { credentialsFromTokens } from './api-key.js';
+import { assignProxy } from '../services/proxy.js';
+import config from '../services/config.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const AUTH0_CLIENT_ID = 'mBtwLFVm39GVZ1HpSRBSdRiLFucYxmMb';
-const AUTH0_AUTHORIZATION_URL = 'https://auth.checklyhq.com/authorize';
+const authorizationUrl = () => `${config.getAuthUrl()}/authorize`;
+const tokenUrl = () => `${config.getAuthUrl()}/oauth/token`;
 const AUTH0_SCOPES = 'openid profile email';
 const AUTH0_CALLBACK_URL = 'http://localhost:4242';
+// Long enough to sign up (which can include confirming an email address),
+// short enough not to block an inline login for long; within what other CLIs
+// use for a browser login (AWS CLI and Heroku wait 10 minutes).
+const LOGIN_TIMEOUT_MS = 10 * 60 * 1000;
+function escapeHtml(value) {
+    return (value ?? '').replace(/[&<>"']/g, char => `&#${char.charCodeAt(0)};`);
+}
 export function generatePKCE() {
     const codeVerifier = crypto
         .randomBytes(64)
@@ -39,8 +46,10 @@ export class AuthContext {
     #codeVerifier;
     #accessToken;
     #idToken;
-    constructor(mode) {
+    #timeoutMs;
+    constructor(mode, { timeoutMs = LOGIN_TIMEOUT_MS } = {}) {
         this.mode = mode;
+        this.#timeoutMs = timeoutMs;
         const { codeChallenge, codeVerifier } = generatePKCE();
         this.#codeChallenge = codeChallenge;
         this.#codeVerifier = codeVerifier;
@@ -52,15 +61,10 @@ export class AuthContext {
             throw new Error('There was an unexpected error retrieving Auth0 token. Please try again or contact '
                 + 'support@checklyhq.com if this problem persists');
         }
-        const { name } = jwtDecode(this.#idToken);
-        const { key } = await this.#getApiKey();
-        return {
-            name,
-            key,
-        };
+        return credentialsFromTokens({ accessToken: this.#accessToken, idToken: this.#idToken });
     }
     #generateAuthenticationUrl() {
-        const url = new URL(AUTH0_AUTHORIZATION_URL);
+        const url = new URL(authorizationUrl());
         const params = new URLSearchParams({
             client_id: AUTH0_CLIENT_ID,
             code_challenge: this.#codeChallenge,
@@ -71,30 +75,61 @@ export class AuthContext {
             state: this.#codeVerifier,
             mode: this.mode === 'signup' ? 'signUp' : '',
             allowLogin: this.mode === 'signup' ? 'false' : 'true',
-            allowSignUp: this.mode === 'signup' ? 'true' : 'false',
+            allowSignUp: this.mode === 'login' ? 'false' : 'true',
         });
         url.search = params.toString();
         return url.toString();
     }
     #startServer() {
         return new Promise((resolve, reject) => {
+            // The CLI may keep running after the login (an authenticated command
+            // logging in inline), so nothing here may keep the process alive
+            // afterwards: every request gets an answer, the response that settles
+            // the login closes its connection instead of keeping it alive for the
+            // browser's next request, and the server stops listening.
             const server = http.createServer();
+            // Nobody may ever finish the login in the browser; without a deadline
+            // the process (and an authenticated command logging in inline) would
+            // wait forever. No response carries `Connection: close` in that case,
+            // so connections the browser keeps alive are dropped explicitly.
+            const timer = setTimeout(() => {
+                server.close();
+                server.closeAllConnections();
+                reject(new Error('The login was not completed in time. Please run the login again.'));
+            }, this.#timeoutMs);
+            const stop = () => {
+                clearTimeout(timer);
+                server.close();
+            };
             server.on('request', (req, res) => {
                 if (req.url?.endsWith('.svg')) {
-                    res.writeHead(200, { 'Content-Type': 'image/svg+xml' });
                     fs.readFile(path.join(__dirname, `.${req.url}`), 'utf8', (err, data) => {
-                        if (!err)
-                            res.end(data);
+                        if (err) {
+                            res.writeHead(404).end();
+                        }
+                        else {
+                            res.writeHead(200, { 'Content-Type': 'image/svg+xml' }).end(data);
+                        }
                     });
+                }
+                else if (req.url?.includes('favicon.ico')) {
+                    res.writeHead(404).end();
                     // `req.url` has a '/' char at the beginning which needs removed to be valid searchParams input
                 }
-                else if (!req.url?.includes('favicon.ico')) {
+                else {
                     const responseParams = new URLSearchParams(req.url?.substring(1));
                     const code = responseParams.get('code');
                     const state = responseParams.get('state');
                     const error = responseParams.get('error');
                     const errorDescription = responseParams.get('error_description');
-                    if (code && state === this.#codeVerifier) {
+                    // A code or an error that answers this login (the state matches)
+                    // settles it, as the device flow does; anything else, such as a
+                    // stray request, leaves the server waiting for the real callback.
+                    const settles = state === this.#codeVerifier && Boolean(code || error);
+                    if (settles) {
+                        res.setHeader('Connection', 'close');
+                    }
+                    if (code && settles) {
                         res.write(`
         <html>
             <style>
@@ -131,6 +166,7 @@ export class AuthContext {
         </body>
         </html>
       `);
+                        stop();
                         resolve(code);
                     }
                     else {
@@ -138,24 +174,24 @@ export class AuthContext {
         <html>
         <body>
           <div style="height:100%;width:100%;inset:0;position:absolute;display:grid;place-items:center;background-color:#EFF2F7;text-align:center;font-family:Inter;">
-            <h3 style="font-weight:200;">Login failed, please try again!</h3>
+            <h3 style="font-weight:200;">${settles ? 'Login failed. Go back to your terminal; you can close this tab.' : 'Login failed, please try again!'}</h3>
             <p>
-              <b>${error}</b>: ${errorDescription}
+              <b>${escapeHtml(error)}</b>: ${escapeHtml(errorDescription)}
             </p>
           </div>
         </body>
         </html>
       `);
+                        if (settles) {
+                            stop();
+                            reject(new Error(`Login failed: ${errorDescription || error}`));
+                        }
                     }
                     res.end();
                 }
             });
-            const signals = ['SIGTERM', 'SIGHUP', 'SIGINT'];
-            signals.forEach(signal => process.on(signal, () => {
-                server.close();
-                process.exitCode = 1;
-            }));
             server.listen(4242).on('error', (err) => {
+                clearTimeout(timer);
                 if (err.code === 'EADDRINUSE') {
                     reject(new Error('Unable to start a local server on port 4242.'
                         + ' Please check that `checkly login` isn\'t already running in a separate tab.'
@@ -176,51 +212,15 @@ export class AuthContext {
             code,
             redirect_uri: AUTH0_CALLBACK_URL,
         });
-        const tokenResponse = await this.#axiosInstance.post('https://auth.checklyhq.com/oauth/token', tokenParams, {
+        const tokenResponse = await axios.post(tokenUrl(), tokenParams, assignProxy(tokenUrl(), {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded',
                 'Accept-Encoding': '*',
             },
-        });
+        }));
         const { access_token: accessToken, id_token: idToken } = tokenResponse.data;
         this.#accessToken = accessToken;
         this.#idToken = idToken;
     }
-    async #getApiKey() {
-        try {
-            await this.#fetchUser();
-        }
-        catch (error) {
-            if (error.response?.status === 401) {
-                await this.#registerUser();
-            }
-            else {
-                throw error;
-            }
-        }
-        const apiKeyName = `CLI User Key (${os.hostname()})`;
-        const { data } = await this.#axiosInstance.post(`/users/me/api-keys?name=${apiKeyName}`);
-        return data;
-    }
-    async #fetchUser() {
-        const { data } = await this.#axiosInstance.get('/users/me');
-        return data;
-    }
-    async #registerUser() {
-        const { data } = await this.#axiosInstance.post('/users/', { accessToken: this.#accessToken });
-        return data;
-    }
-    get #axiosInstance() {
-        // Keep axios instance stateless
-        const { baseURL } = getApiDefaults();
-        const axiosConf = assignProxy(baseURL, {
-            baseURL,
-            headers: {
-                Accept: 'application/json, text/plain, */*',
-                Authorization: `Bearer ${this.#accessToken}`,
-            },
-        });
-        return axios.create(axiosConf);
-    }
 }
 //# sourceMappingURL=index.js.map

package/dist/auth/index.js.map

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

package/dist/commands/account/plan.js

@@ -60,7 +60,7 @@ export default class AccountPlan extends AuthCommand {
         if (args.key) {
             const entitlement = plan.entitlements.find(e => e.key === args.key);
             if (!entitlement) {
-                this.error(`Entitlement "${args.key}" not found. Use "checkly account plan" to see available keys.`);
+                this.error(`Entitlement "${args.key}" not found. Use "checkly account plan" to see available keys.`, { exit: 1 });
             }
             if (flags.output === 'json') {
                 this.log(JSON.stringify(withUpgradeUrl(entitlement, checkoutUrl), null, 2));

package/dist/commands/account/plan.js.map

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

package/dist/commands/account/usage/projections.d.ts

@@ -0,0 +1,16 @@
+import { AuthCommand } from '../../authCommand.js';
+export default class UsageProjectionsCommand extends AuthCommand {
+    static hidden: boolean;
+    static readOnly: boolean;
+    static destructive: boolean;
+    static idempotent: boolean;
+    static description: string;
+    static args: {
+        id: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static flags: {
+        'as-of': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/account/usage/projections.js

@@ -0,0 +1,40 @@
+import { Args, Flags } from '@oclif/core';
+import { AuthCommand } from '../../authCommand.js';
+import { outputFlag } from '../../../helpers/flags.js';
+import { describeUsageError, projectionsParams, validateUsageTermId } from '../../../helpers/usage.js';
+import { exitCodeFor } from '../../../helpers/invalid-input-error.js';
+import * as api from '../../../rest/api.js';
+import { formatUsageProjections } from '../../../formatters/usage.js';
+export default class UsageProjectionsCommand extends AuthCommand {
+    static hidden = false;
+    static readOnly = true;
+    static destructive = false;
+    static idempotent = true;
+    static description = 'Project credit consumption for one usage term through a completed UTC day.';
+    static args = { id: Args.string({ description: 'Usage term UUID.', required: true }) };
+    static flags = {
+        'as-of': Flags.string({
+            description: 'Inclusive completed UTC date (YYYY-MM-DD). Defaults to yesterday UTC; today and future rejected.',
+        }),
+        'output': outputFlag({ default: 'detail' }),
+    };
+    async run() {
+        const { args, flags } = await this.parse(UsageProjectionsCommand);
+        this.style.outputFormat = flags.output;
+        try {
+            const id = validateUsageTermId(args.id);
+            const { data: projections } = await api.usage.getProjections(id, projectionsParams(flags));
+            if (flags.output === 'json') {
+                this.log(JSON.stringify(projections, null, 2));
+                return;
+            }
+            const term = await api.usage.getTerm(id).then(response => response.data).catch(() => undefined);
+            this.log(formatUsageProjections(projections, flags.output === 'md' ? 'md' : 'terminal', term));
+        }
+        catch (err) {
+            this.style.longError('Failed to load usage projections.', describeUsageError(err, { termId: args.id }));
+            process.exitCode = exitCodeFor(err);
+        }
+    }
+}
+//# sourceMappingURL=projections.js.map

package/dist/commands/account/usage/projections.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"projections.js","sourceRoot":"","sources":["../../../../src/commands/account/usage/projections.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAA;AACtG,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAA;AACrE,OAAO,KAAK,GAAG,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AAErE,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,WAAW;IAC9D,MAAM,CAAC,MAAM,GAAG,KAAK,CAAA;IACrB,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAA;IACtB,MAAM,CAAC,WAAW,GAAG,KAAK,CAAA;IAC1B,MAAM,CAAC,UAAU,GAAG,IAAI,CAAA;IACxB,MAAM,CAAC,WAAW,GAAG,4EAA4E,CAAA;IACjG,MAAM,CAAC,IAAI,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,kBAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,CAAA;IACtF,MAAM,CAAC,KAAK,GAAG;QACb,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YACpB,WAAW,EAAE,kGAAkG;SAChH,CAAC;QACF,QAAQ,EAAE,UAAU,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;KAC5C,CAAA;IAED,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;QACjE,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC,MAAM,CAAA;QACtC,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACvC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAA;YAC1F,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;gBAC5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;gBAC9C,OAAM;YACR,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;YAC/F,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAA;QAChG,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,mCAAmC,EAAE,kBAAkB,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;YACvG,OAAO,CAAC,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;QACrC,CAAC;IACH,CAAC"}

package/dist/commands/account/usage/series.d.ts

@@ -2,18 +2,22 @@ import { AuthCommand } from '../../authCommand.js';
 export default class UsageSeriesCommand extends AuthCommand {
     static hidden: boolean;
     static readOnly: boolean;
+    static destructive: boolean;
     static idempotent: boolean;
     static description: string;
     static flags: {
-        interval: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        interval: import("@oclif/core/interfaces").OptionFlag<"month" | "week" | "day" | "total">;
         'group-by': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        include: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
         limit: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
         cursor: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         from: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        to: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'usage-terms-id': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'account-id': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'pricing-rule': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'check-type': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        to: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/account/usage/series.js

@@ -1,111 +1,54 @@
-import { Flags } from '@oclif/core';
 import { AuthCommand } from '../../authCommand.js';
 import { outputFlag } from '../../../helpers/flags.js';
-import { validateIntegerRange } from '../../../helpers/number.js';
-import { describeUsageError, usageRangeFlags, usageRangeParams, usageTermsParams } from '../../../helpers/usage.js';
+import { describeUsageError, loadUsageNames, usageSeriesFlags, usageSeriesParams } from '../../../helpers/usage.js';
+import { exitCodeFor } from '../../../helpers/invalid-input-error.js';
 import * as api from '../../../rest/api.js';
-import { USAGE_GROUP_BY, USAGE_INTERVALS } from '../../../rest/usage.js';
-import { formatUsageSeries, formatUsageSeriesNavigationHints, formatUsageSeriesPaginationInfo, formatUsageWarnings, } from '../../../formatters/usage.js';
-// The API binds the cursor to every resolved query param, so the hint must
-// repeat the flags verbatim. Values are validated enums, dates, and IDs.
-function buildSeriesCommand(flags) {
-    const parts = [
-        'checkly account usage series',
-        '--interval', flags.interval,
-        '--group-by', flags['group-by'],
-        '--limit', String(flags.limit),
-    ];
-    if (flags.from)
-        parts.push('--from', flags.from);
-    if (flags.to)
-        parts.push('--to', flags.to);
-    for (const accountId of flags['account-id'] ?? [])
-        parts.push('--account-id', accountId);
-    for (const checkType of flags['check-type'] ?? [])
-        parts.push('--check-type', checkType);
-    return parts.join(' ');
-}
+import { heading } from '../../../formatters/render.js';
+import { formatUsageCoverage, formatUsageSeries, formatUsagePaginationInfo, formatUsageNavigationHints, usageListCommand, } from '../../../formatters/usage.js';
 export default class UsageSeriesCommand extends AuthCommand {
     static hidden = false;
     static readOnly = true;
+    static destructive = false;
     static idempotent = true;
-    static description = 'List organization usage per period, grouped by account and/or check type.';
-    static flags = {
-        ...usageRangeFlags(),
-        'interval': Flags.string({
-            description: 'Aggregation interval for each row.',
-            options: USAGE_INTERVALS,
-            default: 'day',
-        }),
-        'group-by': Flags.string({
-            description: 'Dimensions to group rows by.',
-            options: USAGE_GROUP_BY,
-            default: 'account,checkType',
-        }),
-        'limit': Flags.integer({
-            char: 'l',
-            description: 'Number of rows to return (1-500).',
-            default: 100,
-        }),
-        'cursor': Flags.string({
-            description: 'Cursor for the next page (from previous output). Re-use the same flags it was issued with.',
-        }),
-        'output': outputFlag({ default: 'table' }),
-    };
+    static description = 'List usage credits per period with composable grouping and optional runs or calculations.';
+    static flags = { ...usageSeriesFlags(), output: outputFlag({ default: 'table' }) };
     async run() {
         const { flags } = await this.parse(UsageSeriesCommand);
         this.style.outputFormat = flags.output;
         try {
-            // Account names only matter for the human views, and they come from the terms.
-            const wantsAccountNames = flags.output !== 'json' && flags['group-by'].includes('account');
-            const [{ data: series }, terms] = await Promise.all([
-                api.usage.getSeries({
-                    ...usageRangeParams(flags),
-                    interval: flags.interval,
-                    groupBy: flags['group-by'],
-                    limit: validateIntegerRange(flags.limit, '--limit', 1, 500),
-                    nextId: flags.cursor,
-                }),
-                wantsAccountNames ? api.usage.getTerms(usageTermsParams(flags)) : undefined,
-            ]);
+            const params = usageSeriesParams(flags);
+            const { data: series } = await api.usage.getSeries(params);
             if (flags.output === 'json') {
                 this.log(JSON.stringify({
                     data: series.data,
-                    pagination: { nextId: series.nextId, length: series.length },
-                    usageTermsId: series.usageTermsId,
+                    pagination: { nextId: series.nextId, length: series.data.length },
                     period: series.period,
-                    warnings: series.warnings,
+                    usageTermsIds: series.usageTermsIds,
+                    interval: series.interval,
+                    groupBy: series.groupBy,
+                    coverage: series.coverage,
                 }, null, 2));
                 return;
             }
+            const wantsNames = series.data.length > 0
+                && (series.groupBy.includes('account') || series.groupBy.includes('usageTerm'));
+            const names = wantsNames ? await loadUsageNames(series.usageTermsIds, series.period) : undefined;
             const fmt = flags.output === 'md' ? 'md' : 'terminal';
-            const output = [];
-            const warnings = formatUsageWarnings(series.warnings, fmt);
-            if (warnings)
-                output.push(warnings, '');
-            if (series.length === 0) {
-                output.push('No usage rows found for the requested range.');
-                this.log(output.join('\n'));
-                return;
-            }
-            const { interval, groupBy } = series.period;
-            const accountNames = terms && new Map(terms.data.accounts.map(account => [account.id, account.name]));
-            output.push(formatUsageSeries(series.data, fmt, { interval, groupBy, accountNames }));
-            if (fmt === 'md') {
-                if (series.nextId)
-                    output.push('', `Next page cursor: \`${series.nextId}\``);
-                this.log(output.join('\n'));
-                return;
-            }
-            output.push('', formatUsageSeriesPaginationInfo(series.length, series.nextId));
-            const hints = formatUsageSeriesNavigationHints(series.nextId, buildSeriesCommand(flags));
-            if (hints)
-                output.push('', hints);
-            this.log(output.join('\n'));
+            const pinned = { ...params, ...series.period, interval: series.interval, groupBy: series.groupBy };
+            this.log([
+                fmt === 'md' ? heading('Usage series', 1, fmt) : '',
+                formatUsageCoverage(series.coverage, fmt),
+                fmt === 'md' ? heading('Usage rows', 2, fmt) : '',
+                formatUsageSeries(series.data, fmt, {
+                    interval: series.interval, groupBy: series.groupBy, include: params.include ?? [], names,
+                }),
+                formatUsagePaginationInfo(series.data.length, series.nextId, 'usage row'),
+                formatUsageNavigationHints(series.nextId, usageListCommand('series', pinned, fmt), fmt),
+            ].filter(Boolean).join('\n\n'));
         }
         catch (err) {
-            this.style.longError('Failed to load usage series.', describeUsageError(err, { to: flags.to }) ?? err);
-            process.exitCode = 1;
+            this.style.longError('Failed to load usage series.', describeUsageError(err));
+            process.exitCode = exitCodeFor(err);
         }
     }
 }

package/dist/commands/account/usage/series.js.map

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

package/dist/commands/account/usage/summary.d.ts

@@ -2,14 +2,17 @@ import { AuthCommand } from '../../authCommand.js';
 export default class UsageSummaryCommand extends AuthCommand {
     static hidden: boolean;
     static readOnly: boolean;
+    static destructive: boolean;
     static idempotent: boolean;
     static description: string;
     static flags: {
         output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         from: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        to: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'usage-terms-id': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'account-id': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'pricing-rule': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'check-type': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        to: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }