Fix(run): arguments are incorrectly gathered leading to duplicates

packages/cli/src/commands/local/run.ts

@@ -2,7 +2,6 @@ import {FileCompletion} from '@heroku-cli/command/lib/completions'
 import {Command, Flags} from '@oclif/core'
 import color from '@heroku-cli/color'
 import {fork as foreman} from '../../lib/local/fork-foreman'
-import {revertSortedArgs} from '../../lib/run/helpers'
 import * as fs from 'fs'
 
 export default class Run extends Command {
@@ -27,9 +26,10 @@ export default class Run extends Command {
   async run() {
     const execArgv: string[] = ['run']
     const {argv, flags} = await this.parse(Run)
-    const userArgvInputOrder = revertSortedArgs(process.argv, argv as string[])
+    const maybeOptionsIndex = process.argv.indexOf('--')
+    const commandArgs = (maybeOptionsIndex === -1 ? argv : process.argv.slice(maybeOptionsIndex + 1)) as string[]
 
-    if (userArgvInputOrder.length === 0) {
+    if (commandArgs.length === 0) {
       const errorMessage = 'Usage: heroku local:run [COMMAND]\nMust specify command to run'
       this.error(errorMessage, {exit: -1})
     }
@@ -44,7 +44,7 @@ export default class Run extends Command {
     if (flags.port) execArgv.push('--port', flags.port)
 
     execArgv.push('--') // disable node-foreman flag parsing
-    execArgv.push(...userArgvInputOrder as string[]) // eslint-disable-line unicorn/no-array-push-push
+    execArgv.push(...commandArgs as string[]) // eslint-disable-line unicorn/no-array-push-push
 
     await foreman(execArgv)
   }

packages/cli/src/commands/run/index.ts

@@ -4,7 +4,7 @@ import {ux} from '@oclif/core'
 import debugFactory from 'debug'
 import * as Heroku from '@heroku-cli/schema'
 import Dyno from '../../lib/run/dyno'
-import {buildCommand, revertSortedArgs} from '../../lib/run/helpers'
+import {buildCommand} from '../../lib/run/helpers'
 
 const debug = debugFactory('heroku:run')
 
@@ -33,14 +33,14 @@ export default class Run extends Command {
 
   async run() {
     const {argv, flags} = await this.parse(Run)
-    const userArgvInputOrder = revertSortedArgs(process.argv, argv as string[])
-
+    const maybeOptionsIndex = process.argv.indexOf('--')
+    const command = buildCommand((maybeOptionsIndex === -1 ? argv : process.argv.slice(maybeOptionsIndex + 1)) as string[])
     const opts = {
       'exit-code': flags['exit-code'],
       'no-tty': flags['no-tty'],
       app: flags.app,
       attach: true,
-      command: buildCommand(userArgvInputOrder as string[]),
+      command,
       env: flags.env,
       heroku: this.heroku,
       listen: flags.listen,