heroku 10.4.0 → 10.4.1-alpha.4

package/bin/heroku-repl.js

@@ -0,0 +1,619 @@
+// do not use the older node:readline module
+// else things will break
+const readline = require('node:readline/promises')
+const yargs = require('yargs-parser')
+const util = require('util')
+const path = require('node:path')
+const fs = require('node:fs')
+const {ux} = require('@oclif/core')
+
+const historyFile = path.join(process.env.HOME || process.env.USERPROFILE, '.heroku_repl_history')
+const stateFile = path.join(process.env.HOME || process.env.USERPROFILE, '.heroku_repl_state')
+
+const maxHistory = 1000
+const mcpMode = process.env.HEROKU_MCP_MODE === 'true'
+/**
+ * Map of commands used to provide completion
+ * data. The key is the flag or arg name to
+ * get data for and the value is an array containing
+ * the command name and an array of arguments to
+ * pass to the command if needed.
+ *
+ * @example
+ * heroku > pipelines:create --app <tab><tab>
+ * heroku > spaces:create --team <tab><tab>
+ */
+const completionCommandByName = new Map([
+  ['app', ['apps', ['--all', '--json']]],
+  ['org', ['orgs', ['--json']]],
+  ['team', ['teams', ['--json']]],
+  ['space', ['spaces', ['--json']]],
+  ['pipeline', ['pipelines', ['--json']]],
+  ['addon', ['addons', ['--json']]],
+  ['domain', ['domains', ['--json']]],
+  ['dyno', ['ps', ['--json']]],
+  ['release', ['releases', ['--json']]],
+  ['stack', ['apps:stacks', ['--json']]],
+])
+
+/**
+ * Map of completion data by flag or arg name.
+ * This is used as a cache for completion data
+ * that is retrieved from a remote source.
+ *
+ * No attempt is made to invalidate these caches
+ * at runtime but they are not preserved between
+ * sessions.
+ */
+const completionResultsByName = new Map()
+
+class HerokuRepl {
+  /**
+   * The OClif config object containing
+   * the command metadata and the means
+   * to execute commands
+   */
+  #config
+
+  /**
+   * A map of key/value pairs used for
+   * the 'set' and 'unset' command
+   */
+  #setValues = new Map()
+
+  /**
+   * The history of the REPL commands used
+   */
+  #history = []
+
+  /**
+   * The write stream for the history file
+   */
+  #historyStream
+
+  /**
+   * The readline interface used for the REPL
+   */
+  #rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+    prompt: 'heroku > ',
+    removeHistoryDuplicates: true,
+    historySize: maxHistory,
+    completer: async line => {
+      if (mcpMode) {
+        return [[], line]
+      }
+
+      const [command, ...parts] = line.split(' ')
+      if (command === 'set') {
+        return this.#buildSetCompletions(parts)
+      }
+
+      const commandMeta = this.#config.findCommand(command)
+      if (!commandMeta) {
+        const matches = this.#config.commands.filter(({id}) => id.startsWith(command))
+        return [matches.map(({id}) => id).sort(), line]
+      }
+
+      return this.#buildCompletions(commandMeta, parts)
+    },
+  })
+
+  /**
+   * Constructs a new instance of the HerokuRepl class.
+   *
+   * @param {Config} config The oclif core config object
+   */
+  constructor(config) {
+    if (!mcpMode) {
+      this.#prepareHistory()
+      this.#loadState()
+    }
+
+    this.#config = config
+  }
+
+  /**
+   * Prepares the REPL history by loading
+   * the previous history from the history file
+   * and opening a write stream for new entries.
+   *
+   * @returns {Promise<void>} a promise that resolves when the history has been loaded
+   */
+  #prepareHistory() {
+    this.#historyStream = fs.createWriteStream(historyFile, {
+      flags: 'a',
+      encoding: 'utf8',
+    })
+
+    // Load existing history first
+    if (fs.existsSync(historyFile)) {
+      this.#history = fs.readFileSync(historyFile, 'utf8')
+        .split('\n')
+        .filter(line => line.trim())
+        .reverse()
+        .splice(0, maxHistory)
+
+      this.#rl.history.push(...this.#history)
+      this.#rl.history
+    }
+  }
+
+  /**
+   * Loads the previous session state from the state file.
+   * @returns {void}
+   */
+  #loadState() {
+    if (fs.existsSync(stateFile)) {
+      try {
+        const state = JSON.parse(fs.readFileSync(stateFile, 'utf8'))
+        for (const entry of Object.entries(state)) {
+          this.#updateFlagsByName('set', entry, true)
+        }
+
+        process.stdout.write('session restored')
+      } catch {
+        // noop
+      }
+    }
+  }
+
+  /**
+   * Waits for the REPL to finish and then
+   * writes the current session state to the state file.
+   *
+   * @returns {Promise<void>} a promise that resolves when the REPL is done
+   */
+  async done() {
+    await new Promise(resolve => {
+      this.#rl.once('close', () => {
+        this.#historyStream?.close()
+        fs.writeFileSync(stateFile, JSON.stringify(Object.fromEntries(this.#setValues)), 'utf8')
+        resolve()
+      })
+    })
+  }
+
+  /**
+   * Process a line of input.
+   * This method will parse the input
+   * and run the command if it is valid.
+   * If the command is invalid, an error
+   * message will be displayed.
+   *
+   * @param {string} line the line to process
+   * @returns void
+   */
+  start() {
+    this.#rl.on('line', this.#processLine)
+    this.#rl.prompt()
+  }
+
+  /**
+   * Processes the line received from the terminal stdin
+   *
+   * @param {string} input the line to process
+   * @returns {Promise<void>} a promise that resolves when the command has been executed
+   */
+  #processLine = async input => {
+    this.#history.push(input)
+    this.#historyStream?.write(input + '\n')
+
+    const {_: [command, ...positionalArgs], ...flags} = yargs(input, {
+      configuration: {
+        'camel-case-expansion': false,
+        'boolean-negation': false,
+      },
+    })
+    const args = Object.entries(flags).flatMap(([key, value]) => {
+      if (typeof value === 'string') {
+        return [`--${key}`, value]
+      }
+
+      return [`--${key}`]
+    }).concat(positionalArgs)
+
+    if (command === 'exit') {
+      process.exit(0)
+    }
+
+    if (command === 'history') {
+      process.stdout.write(this.#history.join('\n'))
+      this.#rl.prompt()
+      return
+    }
+
+    if (command === 'set' || command === 'unset') {
+      this.#updateFlagsByName(command, args)
+      this.#rl.prompt()
+      return
+    }
+
+    const cmd = this.#config.findCommand(command)
+
+    if (!cmd) {
+      console.error(`"${command}" is not a valid command`)
+      this.#rl.prompt()
+      return
+    }
+
+    try {
+      const {flags} = cmd
+      for (const [key, value] of this.#setValues) {
+        if (Reflect.has(flags, key)) {
+          args.push(`--${key}`, value)
+        }
+      }
+
+      // Any commands that prompt the user will cause
+      // the REPL to enter an invalid state. We need
+      // to pause the readline interface and restore
+      // it when the command is done.
+      if (process.stdin.isTTY) {
+        process.stdin.setRawMode(false)
+      }
+
+      this.#rl.pause()
+      this.#rl.off('line', this.#processLine)
+      if (mcpMode) {
+        process.stdout.write('<<<BEGIN RESULTS>>>\n')
+      }
+
+      await this.#config.runCommand(command, args.filter(Boolean))
+    } catch (error) {
+      if (mcpMode) {
+        process.stderr.write(`<<<ERROR>>>\n${error.message}\n<<<END ERROR>>>\n`)
+      } else {
+        console.error(error.message)
+      }
+    } finally {
+      if (process.stdin.isTTY) {
+        process.stdin.setRawMode(true)
+      }
+
+      if (mcpMode) {
+        process.stdout.write('<<<END RESULTS>>>\n')
+      }
+
+      this.#rl.resume()
+      this.#rl.on('line', this.#processLine)
+      // Force readline to refresh the current line
+      this.#rl.write(null, {ctrl: true, name: 'u'})
+    }
+  }
+
+  /**
+   * Updates the session state based on the command and args.
+   *
+   * @param {'set'|'unset'} command either 'set' or 'unset'
+   * @param {string[]} args an array of arg names
+   * @param {boolean} omitConfirmation when false. no confirmation is printed to stdout
+   * @returns {void}
+   */
+  #updateFlagsByName(command, args, omitConfirmation) {
+    if (command === 'set') {
+      const [key, value] = args
+      if (key && value) {
+        this.#setValues.set(key, value)
+
+        if (!omitConfirmation) {
+          process.stdout.write(`setting --${key} to ${value}\n`)
+        }
+
+        if (key === 'app') {
+          this.#rl.setPrompt(`${value} > `)
+        }
+      } else {
+        const values = []
+        for (const [flag, value] of this.#setValues) {
+          values.push({flag, value})
+        }
+
+        if (values.length === 0) {
+          return console.info('no flags set')
+        }
+
+        ux.table(values, {
+          flag: {header: 'Flag'},
+          value: {header: 'Value'},
+        })
+      }
+    }
+
+    if (command === 'unset') {
+      const [key] = args
+
+      if (!omitConfirmation) {
+        process.stdout.write(`unsetting --${key}\n`)
+      }
+
+      this.#setValues.delete(key)
+      if (key === 'app') {
+        this.#rl.setPrompt('heroku > ')
+      }
+    }
+  }
+
+  /**
+   * Build completions for a command.
+   * The completions are based on the
+   * metadata for the command and the
+   * user input.
+   *
+   * @param {Record<string, unknown>} commandMeta the metadata for the command
+   * @param {string[]} flagsOrArgs the flags or args for the command
+   * @returns {Promise<[string[], string]>} the completions and the current input
+   */
+  async #buildCompletions(commandMeta, flagsOrArgs = []) {
+    const {args, flags} = commandMeta
+    const {requiredInputs: requiredFlags, optionalInputs: optionalFlags} = this.#collectInputsFromManifest(flags)
+    const {requiredInputs: requiredArgs, optionalInputs: optionalArgs} = this.#collectInputsFromManifest(args)
+
+    const {_: userArgs, ...userFlags} = yargs(flagsOrArgs, {
+      configuration: {
+        'camel-case-expansion': false,
+        'boolean-negation': false,
+      },
+    })
+    const current = flagsOrArgs[flagsOrArgs.length - 1] ?? ''
+
+    // Order of precedence:
+    // 1. Required flags
+    // 2. Required args
+    // 3. Optional flags
+    // 4. Optional args
+    // 5. End of line
+    // Flags *must* occur first since they may influence
+    // the completions for args.
+    return await this.#getCompletionsForFlag(current, requiredFlags, userFlags, commandMeta) ||
+      await this.#getCompletionsForArg(current, requiredArgs, userArgs, commandMeta) ||
+      await this.#getCompletionsForFlag(current, optionalFlags, userFlags, commandMeta) ||
+      await this.#getCompletionsForArg(current, optionalArgs, userArgs, commandMeta) ||
+      this.#getCompletionsForEndOfLine(flags, userFlags)
+  }
+
+  /**
+   * Get completions for a command.
+   * The completions are based on the
+   * metadata for the command and the
+   * user input.
+   *
+   * @param {[string, string]} parts the parts for a line to get completions for
+   * @returns {[string[], string]} the completions and the current input
+   */
+  async #buildSetCompletions(parts) {
+    const [name, current] = parts
+    if (parts.length > 0 && completionCommandByName.has(name)) {
+      return [await this.#getCompletion(name, current), current]
+    }
+
+    // Critical to completions operating as expected;
+    // the completions must be filtered to omit keys
+    // that do not match our name (if a name exists).
+    const completions = [...completionCommandByName.keys()]
+      .filter(c => !name || c.startsWith(name))
+
+    return [completions, name ?? current]
+  }
+
+  /**
+   * Get completions for the end of the line.
+   *
+   * @param {Record<string, unknown>} flags the flags for the command
+   * @param {Record<string, unknown>} userFlags the flags that have already been used
+   * @returns {[string[], string]} the completions and the current input
+   */
+  #getCompletionsForEndOfLine(flags, userFlags) {
+    const flagKeys = Object.keys(userFlags)
+    // If there are no more flags to complete,
+    // return an empty array.
+    return flagKeys.length < Object.keys(flags).length ? [[' --'], ''] : [[], '']
+  }
+
+  /**
+   * Get completions for a flag or flag value.
+   *
+   * @param {string} current the current input
+   * @param {string[]} flags the flags for the command
+   * @param {string[]} userFlags the flags that have already been used
+   * @param {Record<string, unknown>} commandMeta the metadata for the command
+   * @return {Promise<[string[], string]>} the completions and the current input
+   */
+  async #getCompletionsForFlag(current, flags, userFlags, commandMeta) {
+    // flag completion for long and short flags.
+    // flags that have already been used are
+    // not included in the completions.
+    const isFlag = current.startsWith('-')
+    if (isFlag) {
+      const isLongFlag = current.startsWith('--')
+      const rawFlag = isLongFlag ? current.slice(2) : current.slice(1)
+      const matched = flags
+        .map(f => isLongFlag ? f.long : f.short)
+        .filter(flag => !Reflect.has(userFlags, flag) && (!rawFlag || flag.startsWith(rawFlag)))
+
+      if (matched.length > 0) {
+        return [matched, rawFlag]
+      }
+    }
+
+    // Does the flag have a value?
+    const flagKeys = Object.keys(userFlags)
+    const flag = flagKeys[flagKeys.length - 1]
+    if (!flag || !current) {
+      return null
+    }
+
+    const {options, type} = commandMeta.flags[flag] ?? {}
+    // Options are defined in the metadata
+    // for the command. If the flag has options
+    // defined, we will attempt to complete
+    // based on the options.
+    if (type === 'option') {
+      if (options?.length > 0) {
+        const optionComplete = options.includes(current)
+        const matched = options.filter(o => o.startsWith(current))
+
+        if (!optionComplete) {
+          return matched.length > 0 ? [matched, current] : [options, current]
+        }
+      }
+
+      return [await this.#getCompletion(flag, isFlag ? '' : current), current]
+    }
+  }
+
+  /**
+   * Get completions for a flag.
+   *
+   * @param {string} flag the flag to get the completion for
+   * @param {string} startsWith the string to match against
+   * @returns {Promise<[string[]]>} the completions
+   */
+  async #getCompletion(flag, startsWith) {
+    // attempt to retrieve the options from the
+    // Heroku API. If the options have already
+    // been retrieved, they will be cached.
+    if (completionCommandByName.has(flag)) {
+      let result
+      if (completionResultsByName.has(flag)) {
+        result = completionResultsByName.get(flag)
+      }
+
+      if (!result || result.length === 0) {
+        const [command, args] = completionCommandByName.get(flag)
+        const completionsStr = await this.#captureStdout(() => this.#config.runCommand(command, args)) ?? '[]'
+        result = JSON.parse(util.stripVTControlCharacters(completionsStr))
+        completionResultsByName.set(flag, result)
+      }
+
+      const matched = result
+        .map(obj => obj.name ?? obj.id)
+        .filter(name => !startsWith || name.startsWith(startsWith))
+        .sort()
+
+      return matched
+    }
+  }
+
+  /**
+   * Capture stdout by deflecting it to a
+   * trap function and returning the output.
+   *
+   * This is useful for silently capturing the output
+   * of a command that normally prints to stdout.
+   *
+   * @param {CallableFunction} fn the function to capture stdout for
+   * @returns {Promise<string>} the output from stdout
+   */
+  async #captureStdout(fn) {
+    const output = []
+    const originalWrite = process.stdout.write
+    // Replace stdout.write temporarily
+    process.stdout.write = chunk => {
+      output.push(typeof chunk === 'string' ? chunk : chunk.toString())
+      return true
+    }
+
+    try {
+      await fn()
+      return output.join('')
+    } finally {
+      // Restore original stdout
+      process.stdout.write = originalWrite
+    }
+  }
+
+  /**
+   * Get completions for an arg.
+   *
+   * @param {string} current the current input
+   * @param {({long: string}[])} args the args for the command
+   * @param {string[]} userArgs the args that have already been used
+   * @returns {Promise<[string[], string] | null>} the completions and the current input
+   */
+  async #getCompletionsForArg(current, args = [], userArgs = []) {
+    if (userArgs.length <= args.length) {
+      const arg = args[userArgs.length - 1]
+      if (arg) {
+        const {long} = arg
+        if (completionCommandByName.has(long)) {
+          const completions = await this.#getCompletion(long, current)
+          if (completions.length > 0) {
+            return [completions, current]
+          }
+        }
+
+        return [[`<${long}>`], current]
+      }
+    }
+
+    return null
+  }
+
+  /**
+   * Collect inputs from the command manifest and sorts
+   * them by type and then by required status.
+   *
+   * @param {Record<string, unknown>} commandMeta the metadata from the command manifest
+   * @returns {{requiredInputs: {long: string, short: string}[], optionalInputs: {long: string, short: string}[]}} the inputs from the command manifest
+   */
+  #collectInputsFromManifest(commandMeta) {
+    const requiredInputs = []
+    const optionalInputs = []
+
+    // Prioritize options over booleans
+    const keysByType = Object.keys(commandMeta).sort((a, b) => {
+      const {type: aType} = commandMeta[a]
+      const {type: bType} = commandMeta[b]
+      if (aType === bType) {
+        return 0
+      }
+
+      if (aType === 'option') {
+        return -1
+      }
+
+      if (bType === 'option') {
+        return 1
+      }
+
+      return 0
+    })
+
+    keysByType.forEach(long => {
+      const {required: isRequired, char: short} = commandMeta[long]
+      if (isRequired) {
+        requiredInputs.push({long, short})
+        return
+      }
+
+      optionalInputs.push({long, short})
+    })
+    // Prioritize required inputs
+    // over optional inputs
+    // required inputs are sorted
+    // alphabetically. optional
+    // inputs are sorted alphabetically
+    // and then pushed to the end of
+    // the list.
+    requiredInputs.sort((a, b) => {
+      if (a.long < b.long) {
+        return -1
+      }
+
+      if (a.long > b.long) {
+        return 1
+      }
+
+      return 0
+    })
+
+    return {requiredInputs, optionalInputs}
+  }
+}
+module.exports.herokuRepl = async function (config) {
+  const repl = new HerokuRepl(config)
+  repl.start()
+  return repl.done()
+}

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,37 @@ 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 (!commandName && args.length === 0 && Object.keys(flags).length === 0) {
+      await herokuRepl(config)
+      return
+    }
 
-  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;