heroku 10.8.0 → 10.9.0-beta.0

package/bin/run

@@ -1,10 +1,15 @@
 #!/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
@@ -38,13 +43,36 @@ 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')
 
-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)
+const main = async () => {
+  try {
+    await config.load()
+    const {_: [commandName, ...args], ...flags} = yargs
+    if (flags.repl && args.length === 0 && Object.keys(flags).length === 1) {
+      return herokuRepl(config)
+    }
 
-  return require('@oclif/core/handle')(error)
-})
+    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)
+
+    oclifError(error)
+  }
+}
 
+main()

package/lib/analytics.js

@@ -15,6 +15,8 @@ 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');
@@ -29,7 +31,7 @@ class AnalyticsCommand {
                 cli: this.config.name,
                 command: opts.Command.id,
                 completion: await this._acAnalytics(opts.Command.id),
-                version: this.config.version,
+                version: `${this.config.version}${mcpMode ? ` (MCP ${mcpServerVersion})` : ''}`,
                 plugin: plugin.name,
                 plugin_version: plugin.version,
                 os: this.config.platform,

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: any;
+    version: string;
     exitCode: number;
     exitState: string;
     cliRunDuration: number;

package/lib/global_telemetry.js

@@ -57,10 +57,12 @@ 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,
+        version: `${config.version}${mcpMode ? ` (MCP ${mcpServerVersion})` : ''}`,
         exitCode: 0,
         exitState: 'successful',
         cliRunDuration: 0,