heroku 10.7.1-alpha.1 → 10.8.0-beta.0

package/README.md

@@ -36,7 +36,6 @@ For other issues, [submit a support ticket](https://help.heroku.com/).
 * [`heroku access`](docs/access.md) - manage user access to apps
 * [`heroku accounts`](docs/accounts.md) - list the Heroku accounts in your cache
 * [`heroku addons`](docs/addons.md) - tools and services for developing, extending, and operating your app
-* [`heroku ai`](docs/ai.md) - manage Heroku AI models
 * [`heroku apps`](docs/apps.md) - manage apps on Heroku
 * [`heroku auth`](docs/auth.md) - manage authentication for your Heroku account
 * [`heroku authorizations`](docs/authorizations.md) - OAuth authorizations

package/bin/run

@@ -1,15 +1,10 @@
 #!/usr/bin/env node
 
-const {Config} = require('@oclif/core')
-const root = require.resolve('../package.json')
-const config = new Config({root})
-
 process.env.HEROKU_UPDATE_INSTRUCTIONS = process.env.HEROKU_UPDATE_INSTRUCTIONS || 'update with: "npm update -g heroku"'
 
 const now = new Date()
 const cliStartTime = now.getTime()
 const globalTelemetry = require('../lib/global_telemetry')
-const yargs = require('yargs-parser')(process.argv.slice(2))
 
 process.once('beforeExit', async code => {
   // capture as successful exit
@@ -43,37 +38,13 @@ process.on('SIGTERM', async () => {
 globalTelemetry.initializeInstrumentation()
 
 const oclif = require('@oclif/core')
-const oclifFlush = require('@oclif/core/flush')
-const oclifError = require('@oclif/core/handle')
-const {promptUser} = require('./heroku-prompts')
-const {herokuRepl} = require('./heroku-repl')
-
-const main = async () => {
-  try {
-    await config.load()
-    const {_: [commandName, ...args], ...flags} = yargs
-    if (!commandName && args.length === 0 && Object.keys(flags).length === 0) {
-      await herokuRepl(config)
-      return
-    }
-
-    if (flags.prompt) {
-      delete flags.prompt
-      await promptUser(config, commandName, args, flags)
-      await oclif.run([commandName, ...args], config)
-    } else {
-      await oclif.run(undefined, config)
-    }
 
-    await oclifFlush()
-  } catch (error) {
-    // capture any errors raised by oclif
-    const cliError = error
-    cliError.cliRunDuration = globalTelemetry.computeDuration(cliStartTime)
-    await globalTelemetry.sendTelemetry(cliError)
+oclif.run().then(require('@oclif/core/flush')).catch(async error => {
+  // capture any errors raised by oclif
+  const cliError = error
+  cliError.cliRunDuration = globalTelemetry.computeDuration(cliStartTime)
+  await globalTelemetry.sendTelemetry(cliError)
 
-    oclifError(error)
-  }
-}
+  return require('@oclif/core/handle')(error)
+})
 
-main()

package/lib/analytics.js

@@ -15,8 +15,6 @@ class AnalyticsCommand {
     }
     async record(opts) {
         await this.initialize;
-        const mcpMode = process.env.HEROKU_MCP_MODE === 'true';
-        const mcpServerVersion = process.env.HEROKU_MCP_SERVER_VERSION || 'unknown';
         const plugin = opts.Command.plugin;
         if (!plugin) {
             debug('no plugin found for analytics');
@@ -31,7 +29,7 @@ class AnalyticsCommand {
                 cli: this.config.name,
                 command: opts.Command.id,
                 completion: await this._acAnalytics(opts.Command.id),
-                version: `${this.config.version}${mcpMode ? ` (MCP ${mcpServerVersion})` : ''}`,
+                version: this.config.version,
                 plugin: plugin.name,
                 plugin_version: plugin.version,
                 os: this.config.platform,

package/lib/commands/pg/upgrade/cancel.d.ts

@@ -0,0 +1,13 @@
+import { Command } from '@heroku-cli/command';
+export default class Upgrade extends Command {
+    static topic: string;
+    static description: string;
+    static flags: {
+        confirm: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        app: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    static args: {
+        database: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+    };
+    run(): Promise<void>;
+}

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

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const color_1 = require("@heroku-cli/color");
+const command_1 = require("@heroku-cli/command");
+const core_1 = require("@oclif/core");
+const tsheredoc_1 = require("tsheredoc");
+const fetcher_1 = require("../../../lib/pg/fetcher");
+const host_1 = require("../../../lib/pg/host");
+const util_1 = require("../../../lib/pg/util");
+const confirmCommand_1 = require("../../../lib/confirmCommand");
+const nls_1 = require("../../../nls");
+class Upgrade extends command_1.Command {
+    async run() {
+        const { flags, args } = await this.parse(Upgrade);
+        const { app, confirm } = flags;
+        const { database } = args;
+        const db = await (0, fetcher_1.getAddon)(this.heroku, app, database);
+        if ((0, util_1.legacyEssentialPlan)(db))
+            core_1.ux.error(`You can only use ${color_1.default.cmd('pg:upgrade:*')} commands on Essential-* and higher plans.`);
+        if ((0, util_1.essentialNumPlan)(db))
+            core_1.ux.error(`You can't use ${color_1.default.cmd('pg:upgrade:cancel')} on Essential-tier databases. You can only use this command on Standard-tier and higher leader databases.`);
+        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: (0, host_1.default)() });
+        if (replica.following)
+            core_1.ux.error(`You can't use ${color_1.default.cmd('pg:upgrade:cancel')} on follower databases. You can only use this command on Standard-tier and higher leader databases.`);
+        await (0, confirmCommand_1.default)(app, confirm, (0, tsheredoc_1.default)(`
+      Destructive action
+      You're canceling the scheduled version upgrade for ${color_1.default.addon(db.name)}.
+
+      You can't undo this action.
+    `));
+        try {
+            core_1.ux.action.start(`Cancelling upgrade on ${color_1.default.addon(db.name)}`);
+            const response = await this.heroku.post(`/client/v11/databases/${db.id}/upgrade/cancel`, { hostname: (0, host_1.default)(), body: {} });
+            core_1.ux.action.stop('done\n' + (0, util_1.formatResponseWithCommands)(response.body.message));
+        }
+        catch (error) {
+            const response = error;
+            core_1.ux.error((0, util_1.formatResponseWithCommands)(response.body.message) + `\n\nError ID: ${response.body.id}`);
+        }
+    }
+}
+exports.default = Upgrade;
+Upgrade.topic = 'pg';
+Upgrade.description = (0, tsheredoc_1.default)(`
+    cancels a scheduled upgrade. You can't cancel a version upgrade that's in progress.
+  `);
+Upgrade.flags = {
+    confirm: command_1.flags.string({ char: 'c' }),
+    app: command_1.flags.app({ required: true }),
+};
+Upgrade.args = {
+    database: core_1.Args.string({ description: `${(0, nls_1.nls)('pg:database:arg:description')} ${(0, nls_1.nls)('pg:database:arg:description:default:suffix')}` }),
+};

package/lib/commands/pg/upgrade/dryrun.d.ts

@@ -0,0 +1,14 @@
+import { Command } from '@heroku-cli/command';
+export default class Upgrade extends Command {
+    static topic: string;
+    static description: string;
+    static flags: {
+        confirm: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        version: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        app: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    static args: {
+        database: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+    };
+    run(): Promise<void>;
+}

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

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const color_1 = require("@heroku-cli/color");
+const command_1 = require("@heroku-cli/command");
+const core_1 = require("@oclif/core");
+const tsheredoc_1 = require("tsheredoc");
+const fetcher_1 = require("../../../lib/pg/fetcher");
+const host_1 = require("../../../lib/pg/host");
+const util_1 = require("../../../lib/pg/util");
+const confirmCommand_1 = require("../../../lib/confirmCommand");
+const nls_1 = require("../../../nls");
+class Upgrade extends command_1.Command {
+    async run() {
+        const { flags, args } = await this.parse(Upgrade);
+        const { app, version, confirm } = flags;
+        const { database } = args;
+        const db = await (0, fetcher_1.getAddon)(this.heroku, app, database);
+        if ((0, util_1.legacyEssentialPlan)(db))
+            core_1.ux.error(`You can only use ${color_1.default.cmd('pg:upgrade:*')} commands on Essential-* and higher plans.`);
+        if ((0, util_1.essentialNumPlan)(db))
+            core_1.ux.error(`You can't use ${color_1.default.cmd('pg:upgrade:dryrun')} on Essential-tier databases. You can only use this command on Standard-tier and higher leader databases.`);
+        const versionPhrase = version ? (0, tsheredoc_1.default)(`Postgres version ${version}`) : (0, tsheredoc_1.default)('the latest supported Postgres version');
+        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: (0, host_1.default)() });
+        if (replica.following)
+            core_1.ux.error(`You can't use ${color_1.default.cmd('pg:upgrade:dryrun')} on follower databases. You can only use this command on Standard-tier and higher leader databases.`);
+        await (0, confirmCommand_1.default)(app, confirm, (0, tsheredoc_1.default)(`
+        Destructive action
+        This command starts a test upgrade for ${color_1.default.addon(db.name)} to ${versionPhrase}.
+    `));
+        try {
+            const data = { version };
+            core_1.ux.action.start(`Starting a test upgrade on ${color_1.default.addon(db.name)}`);
+            const response = await this.heroku.post(`/client/v11/databases/${db.id}/upgrade/dry_run`, { hostname: (0, host_1.default)(), body: data });
+            core_1.ux.action.stop('done\n' + (0, util_1.formatResponseWithCommands)(response.body.message));
+        }
+        catch (error) {
+            const response = error;
+            core_1.ux.error((0, util_1.formatResponseWithCommands)(response.body.message) + `\n\nError ID: ${response.body.id}`);
+        }
+    }
+}
+exports.default = Upgrade;
+Upgrade.topic = 'pg';
+Upgrade.description = (0, tsheredoc_1.default)(`
+    simulates a Postgres version upgrade on a Standard-tier and higher leader database by creating and upgrading a follower database. Heroku sends the results of the test upgrade via email.
+  `);
+Upgrade.flags = {
+    confirm: command_1.flags.string({ char: 'c' }),
+    version: command_1.flags.string({ char: 'v', description: 'Postgres version to upgrade to' }),
+    app: command_1.flags.app({ required: true }),
+};
+Upgrade.args = {
+    database: core_1.Args.string({ description: `${(0, nls_1.nls)('pg:database:arg:description')} ${(0, nls_1.nls)('pg:database:arg:description:default:suffix')}` }),
+};

package/lib/commands/pg/upgrade/index.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const color_1 = require("@heroku-cli/color");
+const command_1 = require("@heroku-cli/command");
+const core_1 = require("@oclif/core");
+const tsheredoc_1 = require("tsheredoc");
+const fetcher_1 = require("../../../lib/pg/fetcher");
+const host_1 = require("../../../lib/pg/host");
+const util_1 = require("../../../lib/pg/util");
+const confirmCommand_1 = require("../../../lib/confirmCommand");
+const nls_1 = require("../../../nls");
+class Upgrade extends command_1.Command {
+    async run() {
+        const { flags, args } = await this.parse(Upgrade);
+        const { app, version, confirm } = flags;
+        const { database } = args;
+        const db = await (0, fetcher_1.getAddon)(this.heroku, app, database);
+        if ((0, util_1.legacyEssentialPlan)(db))
+            core_1.ux.error(`You can only use ${color_1.default.cmd('heroku pg:upgrade')} on Essential-tier databases and follower databases on Standard-tier and higher plans.`);
+        const versionPhrase = version ? (0, tsheredoc_1.default)(`Postgres version ${version}`) : (0, tsheredoc_1.default)('the latest supported Postgres version');
+        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: (0, host_1.default)() });
+        if (replica.following) {
+            const { body: configVars } = await this.heroku.get(`/apps/${app}/config-vars`);
+            const origin = (0, util_1.databaseNameFromUrl)(replica.following, configVars);
+            await (0, confirmCommand_1.default)(app, confirm, (0, tsheredoc_1.default)(`
+        We're deprecating this command. To upgrade your database's Postgres version, use the new ${color_1.default.cmd('pg:upgrade:*')} subcommands. See https://devcenter.heroku.com/changelog-items/3179.
+
+        Destructive action
+        You're upgrading ${color_1.default.addon(db.name)} to ${versionPhrase}. The database will stop following ${origin} and become writable.
+
+        You can't undo this action.
+      `));
+        }
+        else if ((0, util_1.essentialNumPlan)(db)) {
+            await (0, confirmCommand_1.default)(app, confirm, (0, tsheredoc_1.default)(`
+        We're deprecating this command. To upgrade your database's Postgres version, use the new ${color_1.default.cmd('pg:upgrade:*')} subcommands. See https://devcenter.heroku.com/changelog-items/3179.
+
+        Destructive action
+        You're upgrading ${color_1.default.addon(db.name)} to ${versionPhrase}.
+
+        You can't undo this action.
+      `));
+        }
+        else {
+            core_1.ux.warn((0, tsheredoc_1.default)(`
+        We're deprecating this command. To upgrade your database's Postgres version, use the new ${color_1.default.cmd('pg:upgrade:*')} subcommands. See https://devcenter.heroku.com/changelog-items/3179.`));
+            core_1.ux.error(`You can only use ${color_1.default.cmd('heroku pg:upgrade')} on Essential-tier databases and follower databases on Standard-tier and higher plans.`);
+        }
+        try {
+            const data = { version };
+            core_1.ux.action.start(`Starting upgrade on ${color_1.default.addon(db.name)}`);
+            const response = await this.heroku.post(`/client/v11/databases/${db.id}/upgrade`, { hostname: (0, host_1.default)(), body: data });
+            core_1.ux.action.stop((0, tsheredoc_1.default)(`done\n${(0, util_1.formatResponseWithCommands)(response.body.message)}`));
+        }
+        catch (error) {
+            const response = error;
+            core_1.ux.error((0, tsheredoc_1.default)(`${(0, util_1.formatResponseWithCommands)(response.body.message)}\n\nError ID: ${response.body.id}`));
+        }
+    }
+}
+exports.default = Upgrade;
+Upgrade.topic = 'pg';
+Upgrade.description = (0, tsheredoc_1.default)(`
+    We're deprecating this command. To upgrade your database's Postgres version, use the new ${color_1.default.cmd('pg:upgrade:*')} subcommands. See https://devcenter.heroku.com/changelog-items/3179.
+    
+    For an Essential-tier plan, this command upgrades the database's Postgres version. For a Standard-tier and higher plan, this command unfollows the leader database before upgrading the Postgres version.
+    `);
+Upgrade.flags = {
+    confirm: command_1.flags.string({ char: 'c' }),
+    version: command_1.flags.string({ char: 'v', description: 'Postgres version to upgrade to' }),
+    app: command_1.flags.app({ required: true }),
+    remote: command_1.flags.remote(),
+};
+Upgrade.args = {
+    database: core_1.Args.string({ description: `${(0, nls_1.nls)('pg:database:arg:description')} ${(0, nls_1.nls)('pg:database:arg:description:default:suffix')}` }),
+};

package/lib/commands/pg/upgrade/prepare.d.ts

@@ -0,0 +1,14 @@
+import { Command } from '@heroku-cli/command';
+export default class Upgrade extends Command {
+    static topic: string;
+    static description: string;
+    static flags: {
+        confirm: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        version: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        app: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    static args: {
+        database: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+    };
+    run(): Promise<void>;
+}

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

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const color_1 = require("@heroku-cli/color");
+const command_1 = require("@heroku-cli/command");
+const core_1 = require("@oclif/core");
+const tsheredoc_1 = require("tsheredoc");
+const fetcher_1 = require("../../../lib/pg/fetcher");
+const host_1 = require("../../../lib/pg/host");
+const util_1 = require("../../../lib/pg/util");
+const confirmCommand_1 = require("../../../lib/confirmCommand");
+const nls_1 = require("../../../nls");
+class Upgrade extends command_1.Command {
+    async run() {
+        const { flags, args } = await this.parse(Upgrade);
+        const { app, version, confirm } = flags;
+        const { database } = args;
+        const db = await (0, fetcher_1.getAddon)(this.heroku, app, database);
+        if ((0, util_1.legacyEssentialPlan)(db))
+            core_1.ux.error(`You can only use ${color_1.default.cmd('pg:upgrade:*')} commands on Essential-* and higher plans.`);
+        if ((0, util_1.essentialNumPlan)(db))
+            core_1.ux.error(`You can only use ${color_1.default.cmd('heroku pg:upgrade:prepare')} on Standard-tier and higher leader databases. For Essential-tier databases, use ${color_1.default.cmd('heroku pg:upgrade:run')} instead.`);
+        const versionPhrase = version ? (0, tsheredoc_1.default)(`Postgres version ${version}`) : (0, tsheredoc_1.default)('the latest supported Postgres version');
+        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: (0, host_1.default)() });
+        if (replica.following)
+            core_1.ux.error(`You can only use ${color_1.default.cmd('heroku pg:upgrade:prepare')} on Standard-tier and higher leader databases. For follower databases, use ${color_1.default.cmd('heroku pg:upgrade:run')} instead.`);
+        await (0, confirmCommand_1.default)(app, confirm, (0, tsheredoc_1.default)(`
+        Destructive action
+        This command prepares the upgrade for ${color_1.default.addon(db.name)} to ${versionPhrase} and schedules to upgrade it during the next available maintenance window.
+    `));
+        try {
+            const data = { version };
+            core_1.ux.action.start(`Preparing upgrade on ${color_1.default.addon(db.name)}`);
+            const response = await this.heroku.post(`/client/v11/databases/${db.id}/upgrade/prepare`, { hostname: (0, host_1.default)(), body: data });
+            core_1.ux.action.stop((0, tsheredoc_1.default)(`done\n${(0, util_1.formatResponseWithCommands)(response.body.message)}`));
+        }
+        catch (error) {
+            const response = error;
+            core_1.ux.error((0, tsheredoc_1.default)(`${(0, util_1.formatResponseWithCommands)(response.body.message)}\n\nError ID: ${response.body.id}`));
+        }
+    }
+}
+exports.default = Upgrade;
+Upgrade.topic = 'pg';
+Upgrade.description = (0, tsheredoc_1.default)(`
+    prepares the upgrade for Standard-tier and higher leader databases and schedules it for the next available maintenance window. To start a version upgrade on Essential-tier and follower databases, use ${color_1.default.cmd('heroku pg:upgrade:run')} instead.
+  `);
+Upgrade.flags = {
+    confirm: command_1.flags.string({ char: 'c' }),
+    version: command_1.flags.string({ char: 'v', description: 'Postgres version to upgrade to' }),
+    app: command_1.flags.app({ required: true }),
+};
+Upgrade.args = {
+    database: core_1.Args.string({ description: `${(0, nls_1.nls)('pg:database:arg:description')} ${(0, nls_1.nls)('pg:database:arg:description:default:suffix')}` }),
+};

package/lib/commands/pg/upgrade/run.d.ts

@@ -0,0 +1,16 @@
+import { Command } from '@heroku-cli/command';
+export default class Upgrade extends Command {
+    static topic: string;
+    static description: string;
+    static examples: string[];
+    static flags: {
+        confirm: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        version: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        app: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        remote: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    static args: {
+        database: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+    };
+    run(): Promise<void>;
+}

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

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const color_1 = require("@heroku-cli/color");
+const command_1 = require("@heroku-cli/command");
+const core_1 = require("@oclif/core");
+const tsheredoc_1 = require("tsheredoc");
+const fetcher_1 = require("../../../lib/pg/fetcher");
+const host_1 = require("../../../lib/pg/host");
+const util_1 = require("../../../lib/pg/util");
+const confirmCommand_1 = require("../../../lib/confirmCommand");
+const nls_1 = require("../../../nls");
+class Upgrade extends command_1.Command {
+    async run() {
+        const { flags, args } = await this.parse(Upgrade);
+        const { app, version, confirm } = flags;
+        const { database } = args;
+        const db = await (0, fetcher_1.getAddon)(this.heroku, app, database);
+        if ((0, util_1.legacyEssentialPlan)(db))
+            core_1.ux.error(`You can only use ${color_1.default.cmd('pg:upgrade:*')} commands on Essential-* and higher plans.`);
+        const versionPhrase = version ? (0, tsheredoc_1.default)(`Postgres version ${version}`) : (0, tsheredoc_1.default)('the latest supported Postgres version');
+        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: (0, host_1.default)() });
+        if ((0, util_1.essentialNumPlan)(db)) {
+            await (0, confirmCommand_1.default)(app, confirm, (0, tsheredoc_1.default)(`
+        Destructive action
+        You're upgrading ${color_1.default.addon(db.name)} to ${versionPhrase}.
+
+        You can't undo this action.
+      `));
+        }
+        else if (replica.following) {
+            const { body: configVars } = await this.heroku.get(`/apps/${app}/config-vars`);
+            const origin = (0, util_1.databaseNameFromUrl)(replica.following, configVars);
+            await (0, confirmCommand_1.default)(app, confirm, (0, tsheredoc_1.default)(`
+        Destructive action
+        You're upgrading ${color_1.default.addon(db.name)} to ${versionPhrase}. The database will stop following ${origin} and become writable.
+
+        You can't undo this action.
+      `));
+        }
+        else {
+            await (0, confirmCommand_1.default)(app, confirm, (0, tsheredoc_1.default)(`
+        Destructive action
+        You're upgrading the Postgres version on ${color_1.default.addon(db.name)}. This action also upgrades any followers on the database.
+
+        You can't undo this action.
+      `));
+        }
+        try {
+            const data = { version };
+            core_1.ux.action.start(`Starting upgrade on ${color_1.default.addon(db.name)}`);
+            const response = await this.heroku.post(`/client/v11/databases/${db.id}/upgrade/run`, { hostname: (0, host_1.default)(), body: data });
+            core_1.ux.action.stop((0, tsheredoc_1.default)(`done\n${(0, util_1.formatResponseWithCommands)(response.body.message)}`));
+        }
+        catch (error) {
+            if (error instanceof Error && 'body' in error) {
+                const response = error;
+                core_1.ux.error((0, tsheredoc_1.default)(`${(0, util_1.formatResponseWithCommands)(response.body.message)}\n\nError ID: ${response.body.id}`));
+            }
+            else {
+                throw error;
+            }
+        }
+    }
+}
+exports.default = Upgrade;
+Upgrade.topic = 'pg';
+Upgrade.description = (0, tsheredoc_1.default)(`
+    starts a Postgres version upgrade
+
+    On Essential-tier databases, this command upgrades the database's Postgres version.
+
+    On Standard-tier and higher leader databases, this command runs a previously scheduled Postgres version upgrade. You must run ${color_1.default.cmd('pg:upgrade:prepare')} before this command to schedule a version upgrade.
+
+    On follower databases, this command unfollows the leader database before upgrading the follower's Postgres version.
+    `);
+Upgrade.examples = [
+    (0, tsheredoc_1.default) `
+      # Upgrade an Essential-tier database to a specific version
+      $ heroku pg:upgrade:run postgresql-curved-12345 --version 14 --app myapp
+    `,
+    (0, tsheredoc_1.default) `
+      # Upgrade a Standard-tier follower database to the latest supported version
+      $ heroku pg:upgrade:run HEROKU_POSTGRESQL_BLUE_URL --app myapp
+    `,
+    (0, tsheredoc_1.default) `
+      # Run a previously scheduled upgrade on a Standard-tier leader database
+      $ heroku pg:upgrade:run DATABASE_URL --app myapp
+    `,
+];
+Upgrade.flags = {
+    confirm: command_1.flags.string({ char: 'c' }),
+    version: command_1.flags.string({ char: 'v', description: 'Postgres version to upgrade to' }),
+    app: command_1.flags.app({ required: true }),
+    remote: command_1.flags.remote({ char: 'r' }),
+};
+Upgrade.args = {
+    database: core_1.Args.string({ description: `${(0, nls_1.nls)('pg:database:arg:description')} ${(0, nls_1.nls)('pg:database:arg:description:default:suffix')}` }),
+};

package/lib/commands/pg/upgrade/wait.d.ts

@@ -0,0 +1,16 @@
+import { Command } from '@heroku-cli/command';
+export default class Wait extends Command {
+    static topic: string;
+    static description: string;
+    static flags: {
+        'wait-interval': import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'no-notify': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        app: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        remote: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    static examples: string[];
+    static args: {
+        database: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+    };
+    run(): Promise<void>;
+}

package/lib/commands/pg/upgrade/wait.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const color_1 = require("@heroku-cli/color");
+const command_1 = require("@heroku-cli/command");
+const core_1 = require("@oclif/core");
+const debug_1 = require("debug");
+const tsheredoc_1 = require("tsheredoc");
+const fetcher_1 = require("../../../lib/pg/fetcher");
+const host_1 = require("../../../lib/pg/host");
+const notify_1 = require("../../../lib/notify");
+const http_call_1 = require("@heroku/http-call");
+const nls_1 = require("../../../nls");
+const util_1 = require("../../../lib/pg/util");
+const wait = (ms) => new Promise(resolve => {
+    setTimeout(resolve, ms);
+});
+class Wait extends command_1.Command {
+    async run() {
+        const { flags, args } = await this.parse(Wait);
+        const { app, 'wait-interval': waitInterval } = flags;
+        const dbName = args.database;
+        const pgDebug = (0, debug_1.default)('pg');
+        const waitFor = async (db) => {
+            const interval = (!waitInterval || waitInterval < 0) ? 5 : waitInterval;
+            let status;
+            let waiting = false;
+            let retries = 20;
+            const notFoundMessage = 'Waiting to provision...';
+            while (true) {
+                try {
+                    ({ body: status } = await this.heroku.get(`/client/v11/databases/${db.id}/upgrade/wait_status`, { hostname: (0, host_1.default)() }));
+                }
+                catch (error) {
+                    if (error instanceof http_call_1.HTTPError && (!retries || error.statusCode !== 404)) {
+                        const httpError = error;
+                        pgDebug(httpError);
+                        throw httpError;
+                    }
+                    retries--;
+                    status = { 'waiting?': true, message: notFoundMessage };
+                }
+                let message = (0, util_1.formatResponseWithCommands)(status.message);
+                if (status.step)
+                    message = (0, tsheredoc_1.default)(`(${status.step}) ${message}`);
+                if (status['error?']) {
+                    (0, notify_1.default)('error', `${db.name} ${message}`, false);
+                    core_1.ux.error(message || '', { exit: 1 });
+                }
+                if (!status['waiting?']) {
+                    if (waiting) {
+                        core_1.ux.action.stop(message);
+                    }
+                    else {
+                        core_1.ux.log((0, tsheredoc_1.default)(`Waiting for database ${color_1.default.yellow(db.name)}... ${message}`));
+                    }
+                    return;
+                }
+                if (!waiting) {
+                    waiting = true;
+                    core_1.ux.action.start(`Waiting for database ${color_1.default.yellow(db.name)}`, message);
+                }
+                core_1.ux.action.status = message;
+                await wait(interval * 1000);
+            }
+        };
+        let dbs = [];
+        if (dbName) {
+            dbs = [await (0, fetcher_1.getAddon)(this.heroku, app, dbName)];
+        }
+        else {
+            core_1.ux.error((0, tsheredoc_1.default)('You must provide a database. Run `--help` for more information on the command.'));
+        }
+        for (const db of dbs) {
+            await waitFor(db);
+        }
+    }
+}
+exports.default = Wait;
+Wait.topic = 'pg';
+Wait.description = 'provides the status of an upgrade and blocks it until the operation is complete';
+Wait.flags = {
+    'wait-interval': command_1.flags.integer({ description: 'how frequently to poll in seconds (to avoid rate limiting)' }),
+    'no-notify': command_1.flags.boolean({ description: 'do not show OS notification' }),
+    app: command_1.flags.app({ required: true }),
+    remote: command_1.flags.remote(),
+};
+Wait.examples = [
+    (0, tsheredoc_1.default)(`
+      # Wait for upgrade to complete with default settings
+      $ heroku pg:upgrade:wait postgresql-curved-12345 --app myapp
+    `),
+    (0, tsheredoc_1.default)(`
+      # Wait with custom polling interval
+      $ heroku pg:upgrade:wait postgresql-curved-12345 --app myapp --wait-interval 10
+    `),
+    (0, tsheredoc_1.default)(`
+      # Wait without showing OS notifications
+      $ heroku pg:upgrade:wait postgresql-curved-12345 --app myapp --no-notify
+    `),
+];
+Wait.args = {
+    database: core_1.Args.string({ description: `${(0, nls_1.nls)('pg:database:arg:description')}` }),
+};

package/lib/global_telemetry.d.ts

@@ -25,7 +25,7 @@ export declare function initializeInstrumentation(): void;
 export declare function setupTelemetry(config: any, opts: any): {
     command: any;
     os: any;
-    version: string;
+    version: any;
     exitCode: number;
     exitState: string;
     cliRunDuration: number;

package/lib/global_telemetry.js

@@ -57,12 +57,10 @@ function setupTelemetry(config, opts) {
     const now = new Date();
     const cmdStartTime = now.getTime();
     const isRegularCmd = Boolean(opts.Command);
-    const mcpMode = process.env.HEROKU_MCP_MODE === 'true';
-    const mcpServerVersion = process.env.HEROKU_MCP_SERVER_VERSION || 'unknown';
     const irregularTelemetryObject = {
         command: opts.id,
         os: config.platform,
-        version: `${config.version}${mcpMode ? ` (MCP ${mcpServerVersion})` : ''}`,
+        version: config.version,
         exitCode: 0,
         exitState: 'successful',
         cliRunDuration: 0,