heroku 10.6.2-alpha.0 → 10.7.0-beta.0

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/addons/create.js

@@ -49,19 +49,10 @@ class Create extends command_1.Command {
         const argv = restParse.argv
             // oclif duplicates specified args in argv
             .filter(arg => arg !== servicePlan);
-        const inferenceRegex = /^heroku-inference/;
-        const isInferenceAddon = inferenceRegex.test(servicePlan);
         if (restParse.nonExistentFlags && restParse.nonExistentFlags.length > 0) {
             process.stderr.write(` ${color_1.default.yellow('›')}   For example: ${color_1.default.cyan(`heroku addons:create -a ${app} ${restParse.raw[0].input} -- ${restParse.nonExistentFlags.join(' ')}`)}`);
             process.stderr.write(` ${color_1.default.yellow('›')}   See https://devcenter.heroku.com/changelog-items/2925 for more info.\n`);
         }
-        if (isInferenceAddon) {
-            core_1.ux.warn((0, tsheredoc_1.default) `
-      Heroku Managed Inference and Agent is a pilot or beta service that is subject to the Beta Services Terms at https://www.salesforce.com/company/legal/customer-agreements/ or a written Unified Pilot Agreement if executed by Customer, and the Non-GA Gen AI and Non-GA Credit Consumption terms in the Product Terms Directory at https://ptd.salesforce.com. While use of this pilot or beta service is itself free, such use may consume GA Heroku credits and/or resources for which the Customer may have paid or be charged. Use of this pilot or beta is at the Customer's sole discretion.
-
-      For clarity and without limitation, the various third-party machine learning and generative artificial intelligence (AI) models and applications (each a “Platform”) integrated with the Beta Service are Non-SFDC Applications, as that term is defined in the Beta Services Terms. Note that these third-party Platforms include features that use generative AI technology. Due to the nature of generative AI, the output that a Platform generates may be unpredictable, and may include inaccurate or harmful responses. Before using any generative AI output, Customer is solely responsible for reviewing the output for accuracy, safety, and compliance with applicable laws and third-party acceptable use policies. In addition, Customer’s use of each Platform may be subject to the Platform’s own terms and conditions, compliance with which Customer is solely responsible.
-    `);
-        }
         const config = parseConfig(argv);
         let addon;
         try {

package/lib/commands/keys/add.js

@@ -51,7 +51,7 @@ class Add extends command_1.Command {
             }
             if (keys.length === 1) {
                 const key = keys[0];
-                core_1.ux.info(`Found an SSH public key at ${color_1.default.cyan(key)}`);
+                core_1.ux.log(`Found an SSH public key at ${color_1.default.cyan(key)}`);
                 if (!flags.yes) {
                     const resp = await confirmPrompt('Would you like to upload it to Heroku?');
                     if (!resp.yes)

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,

package/lib/lib/ci/source.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSourceBlob = void 0;
 const fs = require("async-file");
-const core_1 = require("@oclif/core");
 const git = require("./git");
 const got_1 = require("got");
+const debug_1 = require("debug");
+const ciDebug = (0, debug_1.default)('ci');
 async function uploadArchive(url, filePath) {
     const request = got_1.default.stream.put(url, {
         headers: {
@@ -34,7 +35,7 @@ async function createSourceBlob(ref, command) {
     }
     catch (error) {
         // the commit isn't in the repo, we will package the local git commit instead
-        core_1.ux.debug(`Commit not found in pipeline repository: ${error}`);
+        ciDebug('Commit not found in pipeline repository', error);
     }
     const sourceBlob = await prepareSource(ref, command);
     return sourceBlob.source_blob.get_url;