heroku 11.2.0 → 11.3.0

package/dist/commands/data/pg/upgrade/wait.js

@@ -0,0 +1,18 @@
+import * as color from '@heroku/heroku-cli-util/color';
+import tsheredoc from 'tsheredoc';
+import DataPgWait from '../wait.js';
+const heredoc = tsheredoc.default;
+export default class DataPgUpgradeWait extends DataPgWait {
+    static description = 'shows status of an upgrade until it\'s complete';
+    static examples = [
+        heredoc(`
+      # Wait for upgrade to complete
+      ${color.code('<%= config.bin %> <%= command.id %> DATABASE --app myapp')}
+    `),
+        heredoc(`
+      # Wait with custom polling interval (to avoid rate limiting)
+      ${color.code('<%= config.bin %> <%= command.id %> DATABASE --app myapp --wait-interval 10')}
+    `),
+    ];
+    classicWaitCommand = 'pg:upgrade:wait';
+}

package/dist/commands/data/pg/wait.d.ts

@@ -1,4 +1,4 @@
-import BaseCommand from '../../../lib/data/baseCommand.js';
+import BaseCommand from '../../../lib/data/base-command.js';
 import notify from '../../../lib/notify.js';
 export default class DataPgWait extends BaseCommand {
     static args: {
@@ -12,6 +12,7 @@ export default class DataPgWait extends BaseCommand {
         remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'wait-interval': import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
     };
+    protected classicWaitCommand: string;
     notify(...args: Parameters<typeof notify>): Promise<void>;
     run(): Promise<void>;
     wait(ms: number): Promise<void>;

package/dist/commands/data/pg/wait.js

@@ -1,8 +1,9 @@
-import { color, utils } from '@heroku/heroku-cli-util';
 import { flags as Flags } from '@heroku-cli/command';
+import * as color from '@heroku/heroku-cli-util/color';
+import { DatabaseResolver, isAdvancedDatabase } from '@heroku/heroku-cli-util/utils';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
-import BaseCommand from '../../../lib/data/baseCommand.js';
+import BaseCommand from '../../../lib/data/base-command.js';
 import notify from '../../../lib/notify.js';
 const heredoc = tsheredoc.default;
 export default class DataPgWait extends BaseCommand {
@@ -16,7 +17,7 @@ export default class DataPgWait extends BaseCommand {
     static examples = [
         heredoc(`
       # Wait for database to be available
-      ${color.command('heroku data:pg:wait DATABASE --app myapp')}
+      ${color.code('<%= config.bin %> <%= command.id %> DATABASE --app myapp')}
     `),
     ];
     static flags = {
@@ -31,6 +32,7 @@ export default class DataPgWait extends BaseCommand {
             min: 1,
         }),
     };
+    classicWaitCommand = 'pg:wait';
     async notify(...args) {
         return notify(...args);
     }
@@ -38,13 +40,13 @@ export default class DataPgWait extends BaseCommand {
         const { args, flags } = await this.parse(DataPgWait);
         const { database } = args;
         const { app, 'no-notify': noNotify, 'wait-interval': waitInterval } = flags;
-        const databaseResolver = new utils.pg.DatabaseResolver(this.heroku);
+        const databaseResolver = new DatabaseResolver(this.heroku);
         const db = await databaseResolver.getAttachment(app, database);
         const { addon } = db;
-        if (!utils.pg.isAdvancedDatabase(addon)) {
+        if (!isAdvancedDatabase(addon)) {
             ux.error(heredoc `
         You can only use this command on Advanced-tier databases.
-        Run ${color.code(`heroku pg:wait ${addon.name} -a ${app}`)} instead.`);
+        Use ${color.code(`heroku ${this.classicWaitCommand} ${addon.name} -a ${app}`)} instead.`);
         }
         await this.waitFor(addon, waitInterval || 5, noNotify);
     }

package/dist/commands/domains/index.js

@@ -3,9 +3,9 @@ import { color, hux } from '@heroku/heroku-cli-util';
 import { ux } from '@oclif/core/ux';
 import { orderBy } from 'natural-orderby';
 import Uri from 'urijs';
-import parseKeyValue from '../../lib/utils/keyValueParser.js';
+import parseKeyValue from '../../lib/utils/key-value-parser.js';
 import { paginateRequest } from '../../lib/utils/paginator.js';
-import { huxTableNoWrapOptions } from '../../lib/utils/tableUtils.js';
+import { huxTableNoWrapOptions } from '../../lib/utils/table-utils.js';
 export default class DomainsIndex extends Command {
     static description = 'list domains for an app';
     static examples = [`${color.command('heroku domains')}

package/dist/commands/pg/backups/delete.js

@@ -1,7 +1,7 @@
 import { color, utils } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
-import ConfirmCommand from '../../../lib/confirmCommand.js';
+import ConfirmCommand from '../../../lib/confirm-command.js';
 import backupsFactory from '../../../lib/pg/backups.js';
 export default class Delete extends Command {
     static args = {

package/dist/commands/pg/backups/restore.js

@@ -2,7 +2,7 @@ import { Command, flags } from '@heroku-cli/command';
 import { color, utils } from '@heroku/heroku-cli-util';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
-import ConfirmCommand from '../../../lib/confirmCommand.js';
+import ConfirmCommand from '../../../lib/confirm-command.js';
 import backupsFactory from '../../../lib/pg/backups.js';
 import { nls } from '../../../nls.js';
 const heredoc = tsheredoc.default;

package/dist/commands/pg/copy.js

@@ -1,7 +1,7 @@
 import { color, utils } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
-import ConfirmCommand from '../../lib/confirmCommand.js';
+import ConfirmCommand from '../../lib/confirm-command.js';
 import backupsFactory from '../../lib/pg/backups.js';
 const getAttachmentInfo = async function (heroku, db, app) {
     const dbResolver = new utils.pg.DatabaseResolver(heroku);

package/dist/commands/pg/credentials/destroy.js

@@ -1,7 +1,7 @@
 import { Command, flags } from '@heroku-cli/command';
 import { color, utils } from '@heroku/heroku-cli-util';
 import { Args, ux } from '@oclif/core';
-import ConfirmCommand from '../../../lib/confirmCommand.js';
+import ConfirmCommand from '../../../lib/confirm-command.js';
 import { essentialPlan } from '../../../lib/pg/util.js';
 import { nls } from '../../../nls.js';
 export default class Destroy extends Command {

package/dist/commands/pg/credentials/repair-default.js

@@ -2,7 +2,7 @@ import { color, utils } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
-import ConfirmCommand from '../../../lib/confirmCommand.js';
+import ConfirmCommand from '../../../lib/confirm-command.js';
 import { essentialPlan } from '../../../lib/pg/util.js';
 import { nls } from '../../../nls.js';
 const heredoc = tsheredoc.default;

package/dist/commands/pg/credentials/rotate.js

@@ -1,7 +1,7 @@
 import { Command, flags } from '@heroku-cli/command';
 import { color, utils } from '@heroku/heroku-cli-util';
 import { Args, ux } from '@oclif/core';
-import ConfirmCommand from '../../../lib/confirmCommand.js';
+import ConfirmCommand from '../../../lib/confirm-command.js';
 import { nls } from '../../../nls.js';
 export default class Rotate extends Command {
     static args = {

package/dist/commands/pg/credentials.js

@@ -2,7 +2,7 @@ import { hux, utils } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
 import { Args } from '@oclif/core';
 import { presentCredentialAttachments } from '../../lib/pg/util.js';
-import { huxTableNoWrapOptions } from '../../lib/utils/tableUtils.js';
+import { huxTableNoWrapOptions } from '../../lib/utils/table-utils.js';
 import { nls } from '../../nls.js';
 export default class Credentials extends Command {
     static args = {

package/dist/commands/pg/links/destroy.js

@@ -2,7 +2,7 @@ import { color, utils } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
-import ConfirmCommand from '../../../lib/confirmCommand.js';
+import ConfirmCommand from '../../../lib/confirm-command.js';
 import { essentialPlan } from '../../../lib/pg/util.js';
 const heredoc = tsheredoc.default;
 import { nls } from '../../../nls.js';

package/dist/commands/pg/pull.js

@@ -5,7 +5,7 @@ import { color, utils } from '@heroku/heroku-cli-util';
 // import {SpawnOptions, spawn} from 'node:child_process'
 import childProcess from 'node:child_process';
 import { nls } from '../../nls.js';
-import { connArgs, maybeTunnel, parseExclusions, prepare, spawnPipe, verifyExtensionsMatch, } from '../../lib/pg/push_pull.js';
+import { connArgs, maybeTunnel, parseExclusions, prepare, spawnPipe, verifyExtensionsMatch, } from '../../lib/pg/push-pull.js';
 const { env } = process;
 const heredoc = tsheredoc.default;
 export default class Pull extends Command {

package/dist/commands/pg/push.js

@@ -2,7 +2,7 @@ import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
 import { color, utils } from '@heroku/heroku-cli-util';
-import { connArgs, maybeTunnel, parseExclusions, prepare, spawnPipe, verifyExtensionsMatch, } from '../../lib/pg/push_pull.js';
+import { connArgs, maybeTunnel, parseExclusions, prepare, spawnPipe, verifyExtensionsMatch, } from '../../lib/pg/push-pull.js';
 import childProcess from 'node:child_process';
 import { nls } from '../../nls.js';
 const heredoc = tsheredoc.default;

package/dist/commands/pg/reset.js

@@ -2,7 +2,7 @@ import { color, utils } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
-import ConfirmCommand from '../../lib/confirmCommand.js';
+import ConfirmCommand from '../../lib/confirm-command.js';
 import { nls } from '../../nls.js';
 const heredoc = tsheredoc.default;
 export default class Reset extends Command {

package/dist/commands/pg/unfollow.js

@@ -2,7 +2,7 @@ import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
 import { utils, color } from '@heroku/heroku-cli-util';
 import { databaseNameFromUrl } from '../../lib/pg/util.js';
-import ConfirmCommand from '../../lib/confirmCommand.js';
+import ConfirmCommand from '../../lib/confirm-command.js';
 import tsheredoc from 'tsheredoc';
 import { nls } from '../../nls.js';
 const heredoc = tsheredoc.default;

package/dist/commands/pg/upgrade/cancel.js

@@ -2,7 +2,7 @@ import { color, utils } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
-import ConfirmCommand from '../../../lib/confirmCommand.js';
+import ConfirmCommand from '../../../lib/confirm-command.js';
 import { formatResponseWithCommands } from '../../../lib/pg/util.js';
 import { nls } from '../../../nls.js';
 const heredoc = tsheredoc.default;

package/dist/commands/pg/upgrade/dryrun.js

@@ -2,7 +2,7 @@ import { color, utils } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
-import ConfirmCommand from '../../../lib/confirmCommand.js';
+import ConfirmCommand from '../../../lib/confirm-command.js';
 import { formatResponseWithCommands } from '../../../lib/pg/util.js';
 import { nls } from '../../../nls.js';
 const heredoc = tsheredoc.default;

package/dist/commands/pg/upgrade/prepare.js

@@ -2,7 +2,7 @@ import { color, utils } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
-import ConfirmCommand from '../../../lib/confirmCommand.js';
+import ConfirmCommand from '../../../lib/confirm-command.js';
 import { formatResponseWithCommands } from '../../../lib/pg/util.js';
 import { nls } from '../../../nls.js';
 const heredoc = tsheredoc.default;

package/dist/commands/pg/upgrade/run.js

@@ -2,7 +2,7 @@ import { color, utils } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
-import ConfirmCommand from '../../../lib/confirmCommand.js';
+import ConfirmCommand from '../../../lib/confirm-command.js';
 import { databaseNameFromUrl, formatResponseWithCommands } from '../../../lib/pg/util.js';
 import { nls } from '../../../nls.js';
 const heredoc = tsheredoc.default;

package/dist/commands/ps/index.js

@@ -3,7 +3,7 @@ import { color, hux } from '@heroku/heroku-cli-util';
 import { ux } from '@oclif/core/ux';
 import tsheredoc from 'tsheredoc';
 import { ago } from '../../lib/time.js';
-import { huxTableNoWrapOptions } from '../../lib/utils/tableUtils.js';
+import { huxTableNoWrapOptions } from '../../lib/utils/table-utils.js';
 const heredoc = tsheredoc.default;
 export default class Index extends Command {
     static description = 'list dynos for an app';

package/dist/commands/redis/cli.js

@@ -7,7 +7,7 @@ import * as readline from 'readline';
 import Parser from 'redis-parser';
 import { Client } from 'ssh2';
 import * as tls from 'tls';
-import ConfirmCommand from '../../lib/confirmCommand.js';
+import ConfirmCommand from '../../lib/confirm-command.js';
 import apiFactory from '../../lib/redis/api.js';
 const REPLY_OK = 'OK';
 async function redisCLI(uri, client) {

package/dist/commands/redis/stats-reset.js

@@ -2,7 +2,7 @@ import { Command, flags } from '@heroku-cli/command';
 import * as color from '@heroku/heroku-cli-util/color';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
-import ConfirmCommand from '../../lib/confirmCommand.js';
+import ConfirmCommand from '../../lib/confirm-command.js';
 import redisApi from '../../lib/redis/api.js';
 const heredoc = tsheredoc.default;
 export default class StatsReset extends Command {

package/dist/commands/redis/upgrade.js

@@ -2,7 +2,7 @@ import { Command, flags } from '@heroku-cli/command';
 import * as color from '@heroku/heroku-cli-util/color';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
-import ConfirmCommand from '../../lib/confirmCommand.js';
+import ConfirmCommand from '../../lib/confirm-command.js';
 import redisApi from '../../lib/redis/api.js';
 const heredoc = tsheredoc.default;
 export default class Upgrade extends Command {

package/dist/commands/releases/index.js

@@ -3,7 +3,7 @@ import { color, hux } from '@heroku/heroku-cli-util';
 import { ux } from '@oclif/core/ux';
 import ansis from 'ansis';
 import { lazyModuleLoader } from '../../lib/lazy-module-loader.js';
-import * as statusHelper from '../../lib/releases/status_helper.js';
+import * as statusHelper from '../../lib/releases/status-helper.js';
 import * as time from '../../lib/time.js';
 const getDescriptionTruncation = function (releases, columns, optimizeKey) {
     // width management here is quite opaque.

package/dist/commands/releases/info.js

@@ -3,7 +3,7 @@ import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
 import { quote } from '../../lib/config/quote.js';
 import { findByLatestOrId } from '../../lib/releases/releases.js';
-import { description, color as getStatusColor } from '../../lib/releases/status_helper.js';
+import { description, color as getStatusColor } from '../../lib/releases/status-helper.js';
 export default class Info extends Command {
     static args = {
         release: Args.string({ description: 'ID of the release. If omitted, we use the last release ID.' }),

package/dist/commands/spaces/destroy.js

@@ -3,7 +3,7 @@ import * as color from '@heroku/heroku-cli-util/color';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
 import { getGeneration } from '../../lib/apps/generation.js';
-import ConfirmCommand from '../../lib/confirmCommand.js';
+import ConfirmCommand from '../../lib/confirm-command.js';
 import { displayNat } from '../../lib/spaces/spaces.js';
 const heredoc = tsheredoc.default;
 export default class Destroy extends Command {

package/dist/commands/spaces/peerings/destroy.js

@@ -2,7 +2,7 @@ import * as color from '@heroku/heroku-cli-util/color';
 import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
-import ConfirmCommand from '../../../lib/confirmCommand.js';
+import ConfirmCommand from '../../../lib/confirm-command.js';
 const heredoc = tsheredoc.default;
 export default class Destroy extends Command {
     static args = {

package/dist/commands/spaces/vpn/destroy.js

@@ -2,7 +2,7 @@ import { Command, flags } from '@heroku-cli/command';
 import * as color from '@heroku/heroku-cli-util/color';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
-import ConfirmCommand from '../../../lib/confirmCommand.js';
+import ConfirmCommand from '../../../lib/confirm-command.js';
 const heredoc = tsheredoc.default;
 export default class Destroy extends Command {
     static args = {

package/dist/hooks/command_not_found/setup-otel-telemetry.js

@@ -1,9 +1,12 @@
 const performance_analytics = async function () {
-    const { isTelemetryEnabled } = await import('../../lib/analytics-telemetry/telemetry-utils.js');
+    const { isTelemetryEnabled, getTelemetryDisabledReason, telemetryDebug } = await import('../../lib/analytics-telemetry/telemetry-utils.js');
     // Use the consolidated telemetry check
     if (!isTelemetryEnabled()) {
+        const reason = getTelemetryDisabledReason();
+        telemetryDebug('Telemetry disabled (%s): skipping command_not_found hook, not setting up telemetry for invalid command', reason);
         return;
     }
+    telemetryDebug('Telemetry enabled: command_not_found hook setting up telemetry for invalid command');
     const { telemetryManager } = await import('../../lib/analytics-telemetry/telemetry-manager.js');
     const globalAny = global;
     globalAny.cliTelemetry = telemetryManager.reportCmdNotFound(this.config);

package/dist/hooks/finally/send-otel-and-sentry-errors.js

@@ -31,11 +31,14 @@ const finallyHook = async function (options) {
     if (isUserError(options.error)) {
         return;
     }
-    const { isTelemetryEnabled, spawnTelemetryWorker } = await import('../../lib/analytics-telemetry/telemetry-utils.js');
+    const { isTelemetryEnabled, getTelemetryDisabledReason, spawnTelemetryWorker, telemetryDebug } = await import('../../lib/analytics-telemetry/telemetry-utils.js');
     // Use the consolidated telemetry check
     if (!isTelemetryEnabled()) {
+        const reason = getTelemetryDisabledReason();
+        telemetryDebug('Telemetry disabled (%s): skipping finally hook, not sending error: %s', reason, options.error.message);
         return;
     }
+    telemetryDebug('Telemetry enabled: finally hook spawning worker to send error: %s', options.error.message);
     // Spawn background process to send error without blocking
     spawnTelemetryWorker(options.error);
 };

package/dist/hooks/init/setup-otel-telemetry.js

@@ -1,9 +1,12 @@
 const performance_analytics = async function (options) {
-    const { isTelemetryEnabled } = await import('../../lib/analytics-telemetry/telemetry-utils.js');
+    const { isTelemetryEnabled, getTelemetryDisabledReason, telemetryDebug } = await import('../../lib/analytics-telemetry/telemetry-utils.js');
     // Use the consolidated telemetry check
     if (!isTelemetryEnabled()) {
+        const reason = getTelemetryDisabledReason();
+        telemetryDebug('Telemetry disabled (%s): skipping init hook, not setting up telemetry object', reason);
         return;
     }
+    telemetryDebug('Telemetry enabled: init hook setting up telemetry object for command');
     const { telemetryManager } = await import('../../lib/analytics-telemetry/telemetry-manager.js');
     const globalAny = global;
     globalAny.cliTelemetry = telemetryManager.setupTelemetry(this.config, options);

package/dist/hooks/postrun/send-otel-telemetry.js

@@ -3,15 +3,20 @@ const performance_analytics = async function () {
     if (!globalAny.cliTelemetry) {
         return;
     }
-    const { computeDuration, isTelemetryEnabled, spawnTelemetryWorker } = await import('../../lib/analytics-telemetry/telemetry-utils.js');
+    const { computeDuration, isTelemetryEnabled, getTelemetryDisabledReason, spawnTelemetryWorker, telemetryDebug } = await import('../../lib/analytics-telemetry/telemetry-utils.js');
     // Use the consolidated telemetry check
     if (!isTelemetryEnabled()) {
+        const reason = getTelemetryDisabledReason();
+        telemetryDebug('Telemetry disabled (%s): skipping postrun hook, not sending telemetry for command: %s', reason, globalAny.cliTelemetry.command);
         return;
     }
+    telemetryDebug('Telemetry enabled: postrun hook spawning worker to send telemetry for command: %s', globalAny.cliTelemetry.command);
     const cmdStartTime = globalAny.cliTelemetry.commandRunDuration;
     globalAny.cliTelemetry.commandRunDuration = computeDuration(cmdStartTime);
     globalAny.cliTelemetry.lifecycleHookCompletion.postrun = true;
     // Spawn background process to send telemetry without blocking
     spawnTelemetryWorker(globalAny.cliTelemetry);
+    // Mark telemetry as sent to prevent duplicate sends from beforeExit handler
+    globalAny.telemetrySent = true;
 };
 export default performance_analytics;

package/dist/hooks/prerun/collect-and-send-herokulytics.js

@@ -1,9 +1,12 @@
 const analytics = async function (options) {
-    const { isTelemetryEnabled, spawnTelemetryWorker } = await import('../../lib/analytics-telemetry/telemetry-utils.js');
+    const { isTelemetryEnabled, getTelemetryDisabledReason, spawnTelemetryWorker, telemetryDebug } = await import('../../lib/analytics-telemetry/telemetry-utils.js');
     // Use the consolidated telemetry check
     if (!isTelemetryEnabled()) {
+        const reason = getTelemetryDisabledReason();
+        telemetryDebug('Telemetry disabled (%s): skipping prerun hook, not sending Herokulytics for command: %s', reason, options.Command.id);
         return;
     }
+    telemetryDebug('Telemetry enabled: prerun hook spawning worker to send Herokulytics for command: %s', options.Command.id);
     const { telemetryManager } = await import('../../lib/analytics-telemetry/telemetry-manager.js');
     const globalAny = global;
     // Only setup telemetry if not already initialized (avoid overwriting init hook data)

package/dist/lib/addons/{create_addon.js → create-addon.js}

@@ -1,6 +1,6 @@
 import { color, utils } from '@heroku/heroku-cli-util';
 import { ux } from '@oclif/core/ux';
-import { waitForAddonProvisioning } from './addons_wait.js';
+import { waitForAddonProvisioning } from './addons-wait.js';
 import * as util from './util.js';
 function formatConfigVarsMessage(addon) {
     const configVars = addon.config_vars || [];

package/dist/lib/addons/{destroy_addon.js → destroy-addon.js}

@@ -1,6 +1,6 @@
 import { color, utils } from '@heroku/heroku-cli-util';
 import { ux } from '@oclif/core/ux';
-import { waitForAddonDeprovisioning } from './addons_wait.js';
+import { waitForAddonDeprovisioning } from './addons-wait.js';
 export default async function (heroku, addon, force = false, wait = false) {
     const addonName = addon.name || '';
     async function destroyAddonRequest() {

package/dist/lib/addons/util.js

@@ -1,6 +1,6 @@
 import * as color from '@heroku/heroku-cli-util/color';
 import printf from 'printf';
-import ConfirmCommand from '../confirmCommand.js';
+import ConfirmCommand from '../confirm-command.js';
 export const trapConfirmationRequired = async (app, confirm, fn) => {
     try {
         return await fn(confirm);

package/dist/lib/analytics-telemetry/telemetry-manager.js

@@ -40,7 +40,6 @@ class TelemetryManager {
      */
     async sendTelemetry(currentTelemetry) {
         if (!isTelemetryEnabled()) {
-            telemetryDebug('Telemetry disabled, skipping send');
             return;
         }
         const { backboardOtelClient, sentryClient } = await this.getClients();

package/dist/lib/analytics-telemetry/telemetry-utils.d.ts

@@ -48,12 +48,17 @@ export interface Telemetry {
 export type TelemetryData = CLIError | Telemetry;
 export interface TelemetryGlobal {
     cliTelemetry?: Telemetry;
+    telemetrySent?: boolean;
 }
 export type WorkerData = HerokulyticsData | TelemetryData;
 /**
  * Compute duration from a start time to now
  */
 export declare function computeDuration(cmdStartTime: number): number;
+/**
+ * Get the reason why telemetry is disabled (for logging purposes)
+ */
+export declare function getTelemetryDisabledReason(): null | string;
 /**
  * Get authentication token, cached to avoid recreating Config/APIClient
  * Lazy-loads @heroku-cli/command and @oclif/core/config to avoid loading them during CLI init
@@ -65,6 +70,7 @@ export declare function getToken(): Promise<string | undefined>;
 export declare function getVersion(): string;
 /**
  * Check if telemetry is enabled based on environment variables
+ * Returns both the enabled status and a reason string for logging
  */
 export declare function isTelemetryEnabled(): boolean;
 /**

package/dist/lib/analytics-telemetry/telemetry-utils.js

@@ -21,6 +21,21 @@ export function computeDuration(cmdStartTime) {
     const cmdFinishTime = now.getTime();
     return cmdFinishTime - cmdStartTime;
 }
+/**
+ * Get the reason why telemetry is disabled (for logging purposes)
+ */
+export function getTelemetryDisabledReason() {
+    if (process.env.DISABLE_TELEMETRY === 'true') {
+        return 'DISABLE_TELEMETRY=true';
+    }
+    if (process.platform === 'win32' && process.env.ENABLE_WINDOWS_TELEMETRY !== 'true') {
+        return 'Windows platform requires ENABLE_WINDOWS_TELEMETRY=true';
+    }
+    if (process.env.IS_HEROKU_TEST_ENV === 'true') {
+        return 'IS_HEROKU_TEST_ENV=true';
+    }
+    return null;
+}
 /**
  * Get authentication token, cached to avoid recreating Config/APIClient
  * Lazy-loads @heroku-cli/command and @oclif/core/config to avoid loading them during CLI init
@@ -53,14 +68,18 @@ export function getVersion() {
 }
 /**
  * Check if telemetry is enabled based on environment variables
+ * Returns both the enabled status and a reason string for logging
  */
 export function isTelemetryEnabled() {
-    if (process.env.DISABLE_TELEMETRY === 'true')
+    if (process.env.DISABLE_TELEMETRY === 'true') {
         return false;
-    if (process.platform === 'win32' && process.env.ENABLE_WINDOWS_TELEMETRY !== 'true')
+    }
+    if (process.platform === 'win32' && process.env.ENABLE_WINDOWS_TELEMETRY !== 'true') {
         return false;
-    if (process.env.IS_HEROKU_TEST_ENV === 'true')
+    }
+    if (process.env.IS_HEROKU_TEST_ENV === 'true') {
         return false;
+    }
     return true;
 }
 /**

package/dist/lib/analytics-telemetry/worker-client.d.ts

@@ -1,6 +1,7 @@
 import { TelemetryGlobal } from './telemetry-utils.js';
 declare global {
     var cliTelemetry: TelemetryGlobal['cliTelemetry'];
+    var telemetrySent: TelemetryGlobal['telemetrySent'];
 }
 interface SetupTelemetryOptions {
     cliStartTime: number;
@@ -8,9 +9,10 @@ interface SetupTelemetryOptions {
     enableTelemetry: boolean;
 }
 /**
- * Setup telemetry handlers for signal handlers
- * Note: Normal command completion telemetry is handled by the postrun hook.
- * This only handles SIGINT/SIGTERM cases where hooks don't run.
+ * Setup telemetry handlers for beforeExit and signal handlers
+ * - beforeExit: Fallback for commands where postrun hook doesn't run (e.g., version, --help flags)
+ * - postrun hook: Handles regular commands (sets telemetrySent flag to prevent duplicates)
+ * - SIGINT/SIGTERM: Handles interrupted commands
  */
 export declare function setupTelemetryHandlers(options: SetupTelemetryOptions): void;
 export {};

package/dist/lib/analytics-telemetry/worker-client.js

@@ -1,16 +1,30 @@
 /* eslint-disable n/no-process-exit */
-import { spawnTelemetryWorker } from './telemetry-utils.js';
+/* eslint-disable no-var */
+import { spawnTelemetryWorker, telemetryDebug, } from './telemetry-utils.js';
 /**
- * Setup telemetry handlers for signal handlers
- * Note: Normal command completion telemetry is handled by the postrun hook.
- * This only handles SIGINT/SIGTERM cases where hooks don't run.
+ * Setup telemetry handlers for beforeExit and signal handlers
+ * - beforeExit: Fallback for commands where postrun hook doesn't run (e.g., version, --help flags)
+ * - postrun hook: Handles regular commands (sets telemetrySent flag to prevent duplicates)
+ * - SIGINT/SIGTERM: Handles interrupted commands
  */
 export function setupTelemetryHandlers(options) {
     const { cliStartTime, computeDuration, enableTelemetry } = options;
     if (!enableTelemetry)
         return;
-    // Note: beforeExit handler removed to avoid duplicate telemetry sends.
-    // The postrun hook now handles normal command completion telemetry.
+    // Fallback handler for commands that don't trigger postrun hook
+    // (e.g., version, --version, --help flags handled by oclif)
+    process.once('beforeExit', code => {
+        // Only send if telemetry wasn't already sent by postrun hook
+        if (global.cliTelemetry && !global.telemetrySent) {
+            telemetryDebug('Telemetry enabled: beforeExit spawning worker to send telemetry for command: %s (postrun did not run)', global.cliTelemetry.command);
+            const cmdStartTime = global.cliTelemetry.commandRunDuration;
+            global.cliTelemetry.commandRunDuration = computeDuration(cmdStartTime);
+            global.cliTelemetry.exitCode = code;
+            global.cliTelemetry.cliRunDuration = computeDuration(cliStartTime);
+            spawnTelemetryWorker(global.cliTelemetry);
+            global.telemetrySent = true;
+        }
+    });
     process.on('SIGINT', () => {
         // Spawn background process to send telemetry
         const error = Object.assign(new Error('Received SIGINT'), {

package/dist/lib/certs/{certificate_details.d.ts → certificate-details.d.ts}

@@ -1,2 +1,2 @@
-import { SniEndpoint } from '../types/sni_endpoint.js';
+import { SniEndpoint } from '../types/sni-endpoint.js';
 export declare const displayCertificateDetails: (sniEndpoint: SniEndpoint, message?: string) => void;