heroku 11.4.0 → 11.5.0-alpha.4

package/CHANGELOG.md

@@ -4,62 +4,168 @@ All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 
-## [11.4.0](https://github.com/heroku/cli/compare/v11.3.0...v11.4.0) (2026-05-13)
+## [11.5.0-alpha.4](https://github.com/heroku/cli/compare/v11.2.0...v11.5.0-alpha.4) (2026-05-21)
 
 
 ### Features
 
-* 'data:pg:migrate' command implementation (W-21303011) ([#3546](https://github.com/heroku/cli/issues/3546)) ([127e682](https://github.com/heroku/cli/commit/127e682e23c2798346372528f55397563ad3e505))
-* multi-factor attachment support for Advanced dbs (W-21632630) ([#3655](https://github.com/heroku/cli/issues/3655)) ([87785e8](https://github.com/heroku/cli/commit/87785e809fae29cc23a9c29b44b3a6f285961861))
+* adds 'data:pg:upgrade:run/wait' commands (W-21304392) ([#3551](https://github.com/heroku/cli/issues/3551)) ([3297c5e](https://github.com/heroku/cli/commit/3297c5e218fe9105cd106000cba030e784d17a82))
+* implement heroku git:credentials as a git credential helper ([#3683](https://github.com/heroku/cli/issues/3683)) ([781e99e](https://github.com/heroku/cli/commit/781e99e1b9c56339b1245e30087aa9b312c10e69))
+* remove cached netrc account on logout ([#3710](https://github.com/heroku/cli/issues/3710)) ([b07137b](https://github.com/heroku/cli/commit/b07137bed5282a1618ae7e2b1e7f603eeb9a70be))
+* update accounts and accounts:current commands to use the credential manager ([#3689](https://github.com/heroku/cli/issues/3689)) ([e753d06](https://github.com/heroku/cli/commit/e753d06407fe8ebf6f87b25131d6198d78e824e8))
+* update accounts:add to use the credential manager ([#3699](https://github.com/heroku/cli/issues/3699)) ([49e3938](https://github.com/heroku/cli/commit/49e3938f44ec52451870cf24c692d440a7a69701))
+* update accounts:remove to work with credential manager ([#3701](https://github.com/heroku/cli/issues/3701)) ([89d7b14](https://github.com/heroku/cli/commit/89d7b148df950429f902691c8348afc5bba07454))
+* update accounts:set to work with keychain managers ([#3696](https://github.com/heroku/cli/issues/3696)) ([1f896aa](https://github.com/heroku/cli/commit/1f896aab4b23fb312d444420a06ed9d839ec8cf4))
 
 
 ### Bug Fixes
 
-* align ps:type with customer-facing private/shield dyno names ([#3705](https://github.com/heroku/cli/issues/3705)) ([0b36a1f](https://github.com/heroku/cli/commit/0b36a1f3c0c5ab21b3a3887787f290f62135957f))
-* migrate release scripts from qqjs to script-exec helpers ([#3707](https://github.com/heroku/cli/issues/3707)) ([dcbaa1b](https://github.com/heroku/cli/commit/dcbaa1b153cab52b009811df30cac80aa93c98d9))
-* prevent unhandled promise rejection in apps:destroy ([#3679](https://github.com/heroku/cli/issues/3679)) ([3e4c838](https://github.com/heroku/cli/commit/3e4c838ec28276ed3b3e01dd76d5f6cb78c58f19)), closes [#3677](https://github.com/heroku/cli/issues/3677) [#3677](https://github.com/heroku/cli/issues/3677) [#3677](https://github.com/heroku/cli/issues/3677)
-* updates @heroku-cli/command to address 2FA token prompting bug ([#3690](https://github.com/heroku/cli/issues/3690)) ([eda4459](https://github.com/heroku/cli/commit/eda4459fb8b98442d0650c1612d215c74eb2250b))
-* validate HEROKU_HOST for container registry commands ([#3704](https://github.com/heroku/cli/issues/3704)) ([04df827](https://github.com/heroku/cli/commit/04df8275f933c2f055a384d7deaccd524bfa5220))
+* fix whoami and update heroku-cli-command and heroku-cli-util ([#3719](https://github.com/heroku/cli/issues/3719)) ([7db768f](https://github.com/heroku/cli/commit/7db768f21f0dbe04d8d422f93919bc4f6f9156c5))
+* restore beforeExit handler for version commands and add comprehensive telemetry debug logging ([#3657](https://github.com/heroku/cli/issues/3657)) ([6da79cd](https://github.com/heroku/cli/commit/6da79cd4686133e1ee1f92b59127d8e012739b99))
+* restore git configuration on logout ([#3697](https://github.com/heroku/cli/issues/3697)) ([5479fa5](https://github.com/heroku/cli/commit/5479fa53c75b152aece718999deee50b94b1f5ce))
 
 
-### Documentation
+### Miscellaneous Chores
 
-* add AGENTS.md with CLI design patterns for AI agents ([#3676](https://github.com/heroku/cli/issues/3676)) ([d547ed5](https://github.com/heroku/cli/commit/d547ed5fe25e49180c41fba51b761815af6d5b3f))
+* add registry-url to publish-npm ([3cab9db](https://github.com/heroku/cli/commit/3cab9db8b4caab0e59a712d51fa293d86ca67d0e))
+* ensure latest version of npm CLI is installed for publish-npm ([b3d7c6d](https://github.com/heroku/cli/commit/b3d7c6dd12b6adcb5abc4896e7a7f283bb338f9e))
+* go back to old release method ([13b31e1](https://github.com/heroku/cli/commit/13b31e1d855f58c9fc247efa3d21526f0378c2f5))
+* update CLI analytics to use heroku credential manager ([#3685](https://github.com/heroku/cli/issues/3685)) ([5f86e4c](https://github.com/heroku/cli/commit/5f86e4cf9a6b8ca74d6ef0650abbae1f940fab7d))
+* use corepack to update npm in publish-npm ([bb8903e](https://github.com/heroku/cli/commit/bb8903e8a65822b4d89411b6e9dc69a2c432b9be))
+* v11.5.0-alpha.0 ([b86653b](https://github.com/heroku/cli/commit/b86653bfbf40fef5cb7f26dfe234d9a42015bc10))
 
 
-### Code Refactoring
+### Tests
 
-* apply lint fixes to lib files ([#3668](https://github.com/heroku/cli/issues/3668)) ([eb9b040](https://github.com/heroku/cli/commit/eb9b04021ac902c196a0c216f442c7ce756179bc))
-* apply lint formatting to auth through features commands ([#3665](https://github.com/heroku/cli/issues/3665)) ([7e84cbf](https://github.com/heroku/cli/commit/7e84cbf2706f8edcbc0566255b71b22be64b5c32))
-* apply lint formatting to git through pg commands ([#3666](https://github.com/heroku/cli/issues/3666)) ([fd4c8c0](https://github.com/heroku/cli/commit/fd4c8c0eb178b76479e6ded1e8e99bc14b633af5))
-* apply lint formatting to remaining commands ([#3667](https://github.com/heroku/cli/issues/3667)) ([b3f11bd](https://github.com/heroku/cli/commit/b3f11bd34e8256da3b6a1198ec4845d5e03253c9))
-* apply lint formatting to scripts and hooks folders ([#3669](https://github.com/heroku/cli/issues/3669)) ([8a56a67](https://github.com/heroku/cli/commit/8a56a67f96e6e81603d76955ea78dbc2e1ed4433))
-* apply linting fixes to test helpers, fixtures, and integration tests ([#3671](https://github.com/heroku/cli/issues/3671)) ([6b96cb9](https://github.com/heroku/cli/commit/6b96cb9ed43604db8b21ff4d191dee9fed4dddb8))
-* migrate from qqjs to execa with custom wrapper ([#3678](https://github.com/heroku/cli/issues/3678)) ([ad81615](https://github.com/heroku/cli/commit/ad81615b2d4e6bd470be5ef10b3d35f94d8bed40))
-* migrate to shared eslint config and testing functions ([#3661](https://github.com/heroku/cli/issues/3661)) ([d5ad9ac](https://github.com/heroku/cli/commit/d5ad9acf0f22028475c47fb1e189022cf0374989))
+* update analytics tests to use the credential manager ([#3688](https://github.com/heroku/cli/issues/3688)) ([4fde394](https://github.com/heroku/cli/commit/4fde394ac2351504a727829fd86fd647136afbc8))
 
-## [11.3.0](https://github.com/heroku/cli/compare/v11.2.0...v11.3.0) (2026-04-15)
+## [11.5.0-alpha.3](https://github.com/heroku/cli/compare/v11.2.0...v11.5.0-alpha.3) (2026-05-21)
 
 
 ### Features
 
 * adds 'data:pg:upgrade:run/wait' commands (W-21304392) ([#3551](https://github.com/heroku/cli/issues/3551)) ([3297c5e](https://github.com/heroku/cli/commit/3297c5e218fe9105cd106000cba030e784d17a82))
+* implement heroku git:credentials as a git credential helper ([#3683](https://github.com/heroku/cli/issues/3683)) ([781e99e](https://github.com/heroku/cli/commit/781e99e1b9c56339b1245e30087aa9b312c10e69))
+* remove cached netrc account on logout ([#3710](https://github.com/heroku/cli/issues/3710)) ([b07137b](https://github.com/heroku/cli/commit/b07137bed5282a1618ae7e2b1e7f603eeb9a70be))
+* update accounts and accounts:current commands to use the credential manager ([#3689](https://github.com/heroku/cli/issues/3689)) ([e753d06](https://github.com/heroku/cli/commit/e753d06407fe8ebf6f87b25131d6198d78e824e8))
+* update accounts:add to use the credential manager ([#3699](https://github.com/heroku/cli/issues/3699)) ([49e3938](https://github.com/heroku/cli/commit/49e3938f44ec52451870cf24c692d440a7a69701))
+* update accounts:remove to work with credential manager ([#3701](https://github.com/heroku/cli/issues/3701)) ([89d7b14](https://github.com/heroku/cli/commit/89d7b148df950429f902691c8348afc5bba07454))
+* update accounts:set to work with keychain managers ([#3696](https://github.com/heroku/cli/issues/3696)) ([1f896aa](https://github.com/heroku/cli/commit/1f896aab4b23fb312d444420a06ed9d839ec8cf4))
 
 
 ### Bug Fixes
 
+* fix whoami and update heroku-cli-command and heroku-cli-util ([#3719](https://github.com/heroku/cli/issues/3719)) ([7db768f](https://github.com/heroku/cli/commit/7db768f21f0dbe04d8d422f93919bc4f6f9156c5))
 * restore beforeExit handler for version commands and add comprehensive telemetry debug logging ([#3657](https://github.com/heroku/cli/issues/3657)) ([6da79cd](https://github.com/heroku/cli/commit/6da79cd4686133e1ee1f92b59127d8e012739b99))
+* restore git configuration on logout ([#3697](https://github.com/heroku/cli/issues/3697)) ([5479fa5](https://github.com/heroku/cli/commit/5479fa53c75b152aece718999deee50b94b1f5ce))
 
 
 ### Miscellaneous Chores
 
-* remove @oclif/plugin-legacy dependency ([#3659](https://github.com/heroku/cli/issues/3659)) ([2523d48](https://github.com/heroku/cli/commit/2523d481a79f0d26ab8b6897c6b49d3e5713a218))
+* add registry-url to publish-npm ([3cab9db](https://github.com/heroku/cli/commit/3cab9db8b4caab0e59a712d51fa293d86ca67d0e))
+* ensure latest version of npm CLI is installed for publish-npm ([b3d7c6d](https://github.com/heroku/cli/commit/b3d7c6dd12b6adcb5abc4896e7a7f283bb338f9e))
+* update CLI analytics to use heroku credential manager ([#3685](https://github.com/heroku/cli/issues/3685)) ([5f86e4c](https://github.com/heroku/cli/commit/5f86e4cf9a6b8ca74d6ef0650abbae1f940fab7d))
+* use corepack to update npm in publish-npm ([bb8903e](https://github.com/heroku/cli/commit/bb8903e8a65822b4d89411b6e9dc69a2c432b9be))
+* v11.5.0-alpha.0 ([b86653b](https://github.com/heroku/cli/commit/b86653bfbf40fef5cb7f26dfe234d9a42015bc10))
 
 
-### Code Refactoring
+### Tests
+
+* update analytics tests to use the credential manager ([#3688](https://github.com/heroku/cli/issues/3688)) ([4fde394](https://github.com/heroku/cli/commit/4fde394ac2351504a727829fd86fd647136afbc8))
+
+## [11.5.0-alpha.2](https://github.com/heroku/cli/compare/v11.2.0...v11.5.0-alpha.2) (2026-05-21)
+
+
+### Features
+
+* adds 'data:pg:upgrade:run/wait' commands (W-21304392) ([#3551](https://github.com/heroku/cli/issues/3551)) ([3297c5e](https://github.com/heroku/cli/commit/3297c5e218fe9105cd106000cba030e784d17a82))
+* implement heroku git:credentials as a git credential helper ([#3683](https://github.com/heroku/cli/issues/3683)) ([781e99e](https://github.com/heroku/cli/commit/781e99e1b9c56339b1245e30087aa9b312c10e69))
+* remove cached netrc account on logout ([#3710](https://github.com/heroku/cli/issues/3710)) ([b07137b](https://github.com/heroku/cli/commit/b07137bed5282a1618ae7e2b1e7f603eeb9a70be))
+* update accounts and accounts:current commands to use the credential manager ([#3689](https://github.com/heroku/cli/issues/3689)) ([e753d06](https://github.com/heroku/cli/commit/e753d06407fe8ebf6f87b25131d6198d78e824e8))
+* update accounts:add to use the credential manager ([#3699](https://github.com/heroku/cli/issues/3699)) ([49e3938](https://github.com/heroku/cli/commit/49e3938f44ec52451870cf24c692d440a7a69701))
+* update accounts:remove to work with credential manager ([#3701](https://github.com/heroku/cli/issues/3701)) ([89d7b14](https://github.com/heroku/cli/commit/89d7b148df950429f902691c8348afc5bba07454))
+* update accounts:set to work with keychain managers ([#3696](https://github.com/heroku/cli/issues/3696)) ([1f896aa](https://github.com/heroku/cli/commit/1f896aab4b23fb312d444420a06ed9d839ec8cf4))
+
+
+### Bug Fixes
+
+* fix whoami and update heroku-cli-command and heroku-cli-util ([#3719](https://github.com/heroku/cli/issues/3719)) ([7db768f](https://github.com/heroku/cli/commit/7db768f21f0dbe04d8d422f93919bc4f6f9156c5))
+* restore beforeExit handler for version commands and add comprehensive telemetry debug logging ([#3657](https://github.com/heroku/cli/issues/3657)) ([6da79cd](https://github.com/heroku/cli/commit/6da79cd4686133e1ee1f92b59127d8e012739b99))
+* restore git configuration on logout ([#3697](https://github.com/heroku/cli/issues/3697)) ([5479fa5](https://github.com/heroku/cli/commit/5479fa53c75b152aece718999deee50b94b1f5ce))
+
+
+### Miscellaneous Chores
+
+* add registry-url to publish-npm ([3cab9db](https://github.com/heroku/cli/commit/3cab9db8b4caab0e59a712d51fa293d86ca67d0e))
+* ensure latest version of npm CLI is installed for publish-npm ([b3d7c6d](https://github.com/heroku/cli/commit/b3d7c6dd12b6adcb5abc4896e7a7f283bb338f9e))
+* update CLI analytics to use heroku credential manager ([#3685](https://github.com/heroku/cli/issues/3685)) ([5f86e4c](https://github.com/heroku/cli/commit/5f86e4cf9a6b8ca74d6ef0650abbae1f940fab7d))
+* v11.5.0-alpha.0 ([b86653b](https://github.com/heroku/cli/commit/b86653bfbf40fef5cb7f26dfe234d9a42015bc10))
+
+
+### Tests
+
+* update analytics tests to use the credential manager ([#3688](https://github.com/heroku/cli/issues/3688)) ([4fde394](https://github.com/heroku/cli/commit/4fde394ac2351504a727829fd86fd647136afbc8))
+
+## [11.5.0-alpha.1](https://github.com/heroku/cli/compare/v11.2.0...v11.5.0-alpha.1) (2026-05-21)
+
+
+### Features
+
+* adds 'data:pg:upgrade:run/wait' commands (W-21304392) ([#3551](https://github.com/heroku/cli/issues/3551)) ([3297c5e](https://github.com/heroku/cli/commit/3297c5e218fe9105cd106000cba030e784d17a82))
+* implement heroku git:credentials as a git credential helper ([#3683](https://github.com/heroku/cli/issues/3683)) ([781e99e](https://github.com/heroku/cli/commit/781e99e1b9c56339b1245e30087aa9b312c10e69))
+* remove cached netrc account on logout ([#3710](https://github.com/heroku/cli/issues/3710)) ([b07137b](https://github.com/heroku/cli/commit/b07137bed5282a1618ae7e2b1e7f603eeb9a70be))
+* update accounts and accounts:current commands to use the credential manager ([#3689](https://github.com/heroku/cli/issues/3689)) ([e753d06](https://github.com/heroku/cli/commit/e753d06407fe8ebf6f87b25131d6198d78e824e8))
+* update accounts:add to use the credential manager ([#3699](https://github.com/heroku/cli/issues/3699)) ([49e3938](https://github.com/heroku/cli/commit/49e3938f44ec52451870cf24c692d440a7a69701))
+* update accounts:remove to work with credential manager ([#3701](https://github.com/heroku/cli/issues/3701)) ([89d7b14](https://github.com/heroku/cli/commit/89d7b148df950429f902691c8348afc5bba07454))
+* update accounts:set to work with keychain managers ([#3696](https://github.com/heroku/cli/issues/3696)) ([1f896aa](https://github.com/heroku/cli/commit/1f896aab4b23fb312d444420a06ed9d839ec8cf4))
+
+
+### Bug Fixes
+
+* fix whoami and update heroku-cli-command and heroku-cli-util ([#3719](https://github.com/heroku/cli/issues/3719)) ([7db768f](https://github.com/heroku/cli/commit/7db768f21f0dbe04d8d422f93919bc4f6f9156c5))
+* restore beforeExit handler for version commands and add comprehensive telemetry debug logging ([#3657](https://github.com/heroku/cli/issues/3657)) ([6da79cd](https://github.com/heroku/cli/commit/6da79cd4686133e1ee1f92b59127d8e012739b99))
+* restore git configuration on logout ([#3697](https://github.com/heroku/cli/issues/3697)) ([5479fa5](https://github.com/heroku/cli/commit/5479fa53c75b152aece718999deee50b94b1f5ce))
+
+
+### Miscellaneous Chores
+
+* update CLI analytics to use heroku credential manager ([#3685](https://github.com/heroku/cli/issues/3685)) ([5f86e4c](https://github.com/heroku/cli/commit/5f86e4cf9a6b8ca74d6ef0650abbae1f940fab7d))
+* v11.5.0-alpha.0 ([b86653b](https://github.com/heroku/cli/commit/b86653bfbf40fef5cb7f26dfe234d9a42015bc10))
+
+
+### Tests
+
+* update analytics tests to use the credential manager ([#3688](https://github.com/heroku/cli/issues/3688)) ([4fde394](https://github.com/heroku/cli/commit/4fde394ac2351504a727829fd86fd647136afbc8))
+
+## [11.5.0-alpha.0](https://github.com/heroku/cli/compare/v11.2.0...v11.5.0-alpha.0) (2026-05-21)
+
+
+### Features
+
+* adds 'data:pg:upgrade:run/wait' commands (W-21304392) ([#3551](https://github.com/heroku/cli/issues/3551)) ([3297c5e](https://github.com/heroku/cli/commit/3297c5e218fe9105cd106000cba030e784d17a82))
+* implement heroku git:credentials as a git credential helper ([#3683](https://github.com/heroku/cli/issues/3683)) ([781e99e](https://github.com/heroku/cli/commit/781e99e1b9c56339b1245e30087aa9b312c10e69))
+* remove cached netrc account on logout ([#3710](https://github.com/heroku/cli/issues/3710)) ([b07137b](https://github.com/heroku/cli/commit/b07137bed5282a1618ae7e2b1e7f603eeb9a70be))
+* update accounts and accounts:current commands to use the credential manager ([#3689](https://github.com/heroku/cli/issues/3689)) ([e753d06](https://github.com/heroku/cli/commit/e753d06407fe8ebf6f87b25131d6198d78e824e8))
+* update accounts:add to use the credential manager ([#3699](https://github.com/heroku/cli/issues/3699)) ([49e3938](https://github.com/heroku/cli/commit/49e3938f44ec52451870cf24c692d440a7a69701))
+* update accounts:remove to work with credential manager ([#3701](https://github.com/heroku/cli/issues/3701)) ([89d7b14](https://github.com/heroku/cli/commit/89d7b148df950429f902691c8348afc5bba07454))
+* update accounts:set to work with keychain managers ([#3696](https://github.com/heroku/cli/issues/3696)) ([1f896aa](https://github.com/heroku/cli/commit/1f896aab4b23fb312d444420a06ed9d839ec8cf4))
+
+
+### Bug Fixes
+
+* fix whoami and update heroku-cli-command and heroku-cli-util ([#3719](https://github.com/heroku/cli/issues/3719)) ([7db768f](https://github.com/heroku/cli/commit/7db768f21f0dbe04d8d422f93919bc4f6f9156c5))
+* restore beforeExit handler for version commands and add comprehensive telemetry debug logging ([#3657](https://github.com/heroku/cli/issues/3657)) ([6da79cd](https://github.com/heroku/cli/commit/6da79cd4686133e1ee1f92b59127d8e012739b99))
+* restore git configuration on logout ([#3697](https://github.com/heroku/cli/issues/3697)) ([5479fa5](https://github.com/heroku/cli/commit/5479fa53c75b152aece718999deee50b94b1f5ce))
+
+
+### Miscellaneous Chores
+
+* update CLI analytics to use heroku credential manager ([#3685](https://github.com/heroku/cli/issues/3685)) ([5f86e4c](https://github.com/heroku/cli/commit/5f86e4cf9a6b8ca74d6ef0650abbae1f940fab7d))
+
+
+### Tests
 
-* apply lint formatting to access, accounts, addons, and apps commands ([#3664](https://github.com/heroku/cli/issues/3664)) ([5568483](https://github.com/heroku/cli/commit/5568483130be2eb90bae4096b89c164dcd1d8742))
-* rename lib and script files to kebab-case ([#3663](https://github.com/heroku/cli/issues/3663)) ([c6a101f](https://github.com/heroku/cli/commit/c6a101f4295425ccd362d315f8d2733d88bc6278))
+* update analytics tests to use the credential manager ([#3688](https://github.com/heroku/cli/issues/3688)) ([4fde394](https://github.com/heroku/cli/commit/4fde394ac2351504a727829fd86fd647136afbc8))
 
 ## [11.2.0](https://github.com/heroku/cli/compare/v11.1.1...v11.2.0) (2026-04-08)
 

package/bin/bats-test-runner.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import {spawn} from 'node:child_process'
-import os from 'node:os'
+import os from 'os'
+import { spawn } from 'child_process'
 
 if (os.platform() === 'win32' || os.platform() === 'windows') console.log('skipping on windows')
-else spawn('npx bats test/acceptance/*.bats', {shell: true, stdio: 'inherit'})
+else spawn('npx bats test/acceptance/*.bats', {stdio: 'inherit', shell: true})

package/bin/run.js

@@ -12,7 +12,7 @@ process.env.HEROKU_UPDATE_INSTRUCTIONS = process.env.HEROKU_UPDATE_INSTRUCTIONS
 const now = new Date()
 const cliStartTime = now.getTime()
 
-const {getTelemetryDisabledReason, isTelemetryEnabled, telemetryDebug} = await import('../dist/lib/analytics-telemetry/telemetry-utils.js')
+const {isTelemetryEnabled, getTelemetryDisabledReason, telemetryDebug} = await import('../dist/lib/analytics-telemetry/telemetry-utils.js')
 const enableTelemetry = isTelemetryEnabled()
 
 if (enableTelemetry) {

package/dist/commands/access/add.js

@@ -1,7 +1,7 @@
 import { Command, flags } from '@heroku-cli/command';
 import * as color from '@heroku/heroku-cli-util/color';
 import { Args, ux } from '@oclif/core';
-import { getOwner, isTeamApp } from '../../lib/team-utils.js';
+import { getOwner, isTeamApp } from '../../lib/teamUtils.js';
 export default class AccessAdd extends Command {
     static args = {
         email: Args.string({ description: 'email address of the team member', required: true }),

package/dist/commands/access/index.js

@@ -3,7 +3,7 @@ import { HerokuAPIError } from '@heroku-cli/command/lib/api-client.js';
 import { color, hux } from '@heroku/heroku-cli-util';
 import { ux } from '@oclif/core/ux';
 import { lazyModuleLoader } from '../../lib/lazy-module-loader.js';
-import { getOwner, isTeamApp } from '../../lib/team-utils.js';
+import { getOwner, isTeamApp } from '../../lib/teamUtils.js';
 export default class AccessIndex extends Command {
     static description = 'list who has access to an app';
     static flags = {

package/dist/commands/access/update.js

@@ -1,7 +1,7 @@
 import { Command, flags } from '@heroku-cli/command';
 import * as color from '@heroku/heroku-cli-util/color';
 import { Args, ux } from '@oclif/core';
-import { isTeamApp } from '../../lib/team-utils.js';
+import { isTeamApp } from '../../lib/teamUtils.js';
 export default class Update extends Command {
     static args = {
         email: Args.string({ description: 'email address of the team member', required: true }),
@@ -25,7 +25,7 @@ export default class Update extends Command {
         if (!isTeamApp(appInfo?.owner?.email))
             this.error(`Error: cannot update permissions. The app ${color.app(appName)} is not owned by a team`);
         permissions.push('view');
-        permissions = [...new Set(permissions.sort())];
+        permissions = Array.from(new Set(permissions.sort()));
         ux.action.start(`Updating ${color.user(args.email)} in application ${color.app(appName)} with ${permissions} permissions`);
         await this.heroku.patch(`/teams/apps/${appName}/collaborators/${args.email}`, {
             body: { permissions },

package/dist/commands/accounts/add.js

@@ -11,19 +11,13 @@ export default class Add extends Command {
     async run() {
         const { args } = await this.parse(Add);
         const { name } = args;
-        const logInMessage = 'You must be logged in to run this command.';
-        if (AccountsModule.list().some(a => a.name === name)) {
+        const accounts = await AccountsModule.list();
+        if (accounts.some(account => account.name === name)) {
             ux.error(`${name} already exists`);
         }
         const { body: account } = await this.heroku.get('/account');
-        const email = account.email || '';
-        const token = this.heroku.auth || '';
-        if (token === '') {
-            ux.error(logInMessage);
-        }
-        if (email === '') {
-            ux.error(logInMessage);
-        }
+        const email = account.email;
+        const token = this.heroku.auth;
         AccountsModule.add(name, email, token);
     }
 }

package/dist/commands/accounts/current.js

@@ -8,7 +8,7 @@ export default class Current extends Command {
     static example = `${color.command('heroku accounts:current')}`;
     static promptFlagActive = false;
     async run() {
-        const accountName = await AccountsModule.current();
+        const accountName = await AccountsModule.current(this.heroku);
         if (accountName) {
             hux.styledHeader(`Current account is ${color.user(accountName)}`);
         }

package/dist/commands/accounts/index.js

@@ -8,16 +8,17 @@ export default class AccountsIndex extends Command {
     static example = `${color.command('heroku accounts')}`;
     static promptFlagActive = false;
     async run() {
-        const accounts = accountsModule.list();
+        const accounts = await accountsModule.list();
         if (accounts.length === 0) {
             ux.error('You don\'t have any accounts in your cache.');
         }
+        const current = await accountsModule.current(this.heroku);
         for (const account of accounts) {
-            if (account.name === await accountsModule.current()) {
-                ux.stdout(`* ${account.name}`);
+            if (account.name === current || account.username === current) {
+                ux.stdout(`* ${account.name ?? account.username}`);
             }
             else {
-                ux.stdout(`  ${account.name}`);
+                ux.stdout(`  ${account.name ?? account.username}`);
             }
         }
     }

package/dist/commands/accounts/remove.js

@@ -11,12 +11,12 @@ export default class Remove extends Command {
     async run() {
         const { args } = await this.parse(Remove);
         const { name } = args;
-        if (!AccountsModule.list().some(a => a.name === name)) {
+        if (!(await AccountsModule.list()).some(account => account.name === name || account.username === name)) {
             ux.error(`${name} doesn't exist in your accounts cache.`);
         }
-        if (await AccountsModule.current() === name) {
-            ux.error(`${name} is the current account.`);
+        if (await AccountsModule.current(this.heroku) === name) {
+            ux.error(`${name} is the current account. To log out, run ${color.command('heroku logout')}.`);
         }
-        AccountsModule.remove(name);
+        await AccountsModule.remove(name);
     }
 }

package/dist/commands/accounts/set.js

@@ -4,16 +4,20 @@ import { Args, ux } from '@oclif/core';
 import AccountsModule from '../../lib/accounts/accounts.js';
 export default class Set extends Command {
     static args = {
-        name: Args.string({ description: 'name of account to set', required: true }),
+        name: Args.string({ description: 'name or username of account to set', required: true }),
     };
-    static description = 'set the current Heroku account from your cache';
+    static description = 'set the current Heroku account from your accounts cache or system keychain';
     static example = `${color.command('heroku accounts:set my-account')}`;
     async run() {
         const { args } = await this.parse(Set);
         const { name } = args;
-        if (!AccountsModule.list().some(a => a.name === name)) {
-            ux.error(`${name} does not exist in your accounts cache.`);
+        const accounts = await AccountsModule.list();
+        const netrcAccount = accounts.find(account => account.name === name);
+        const keychainAccount = accounts.find(account => !account.name && account.username === name);
+        if (!netrcAccount && !keychainAccount) {
+            ux.error(`${name} does not exist in your accounts cache or system keychain.`);
         }
-        AccountsModule.set(name);
+        const account = netrcAccount ?? keychainAccount;
+        await AccountsModule.set(account, this.config.dataDir);
     }
 }

package/dist/commands/addons/create.js

@@ -2,7 +2,7 @@ import { Command, flags } from '@heroku-cli/command';
 import * as color from '@heroku/heroku-cli-util/color';
 import { Args, ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
-import createAddon from '../../lib/addons/create-addon.js';
+import createAddon from '../../lib/addons/create_addon.js';
 import notify from '../../lib/notify.js';
 const heredoc = tsheredoc.default;
 export default class Create extends Command {

package/dist/commands/addons/destroy.js

@@ -1,9 +1,9 @@
-import { Command, flags } from '@heroku-cli/command';
 import { color, utils } from '@heroku/heroku-cli-util';
+import { Command, flags } from '@heroku-cli/command';
 import { Args } from '@oclif/core';
 import _ from 'lodash';
-import destroyAddon from '../../lib/addons/destroy-addon.js';
-import ConfirmCommand from '../../lib/confirm-command.js';
+import destroyAddon from '../../lib/addons/destroy_addon.js';
+import ConfirmCommand from '../../lib/confirmCommand.js';
 import notify from '../../lib/notify.js';
 export default class Destroy extends Command {
     static args = {

package/dist/commands/addons/docs.js

@@ -1,5 +1,5 @@
-import { Command, flags } from '@heroku-cli/command';
 import * as color from '@heroku/heroku-cli-util/color';
+import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
 import open from 'open';
 import { resolveAddon } from '../../lib/addons/resolve.js';

package/dist/commands/addons/index.js

@@ -3,7 +3,7 @@ import { color, hux } from '@heroku/heroku-cli-util';
 import { ux } from '@oclif/core/ux';
 import _ from 'lodash';
 import { formatPrice, formatState, grandfatheredPrice } from '../../lib/addons/util.js';
-import { huxTableNoWrapOptions } from '../../lib/utils/table-utils.js';
+import { huxTableNoWrapOptions } from '../../lib/utils/tableUtils.js';
 const topic = 'addons';
 export default class Addons extends Command {
     static description = `Lists your add-ons and attachments.
@@ -61,7 +61,6 @@ async function addonGetter(api, app) {
             },
         });
         const sudoHeaders = JSON.parse(process.env.HEROKU_HEADERS || '{}');
-        // eslint-disable-next-line unicorn/prefer-ternary
         if (sudoHeaders['X-Heroku-Sudo'] && !sudoHeaders['X-Heroku-Sudo-User']) {
             // because the root /addon-attachments endpoint won't include relevant
             // attachments when sudo-ing for another app, we will use the more
@@ -103,14 +102,15 @@ async function addonGetter(api, app) {
     // This is probably normal (because we are asking API for all attachments)
     // but it could also be due to certain types of permissions issues, so check
     // if the attachment looks relevant to the app, and then render whatever
-    for (const atts of _.values(groupedAttachments)) {
+    _.values(groupedAttachments)
+        .forEach(atts => {
         const inaccessibleAddon = {
             addon_service: {}, app: atts[0].addon.app, attachments: atts, name: atts[0].addon.name, plan: {},
         };
         if (isRelevantToApp(inaccessibleAddon)) {
             addons.push(inaccessibleAddon);
         }
-    }
+    });
     return addons;
 }
 function displayAll(addons, noWrap = false) {

package/dist/commands/addons/info.js

@@ -1,5 +1,5 @@
-import { Command, flags } from '@heroku-cli/command';
 import { color, hux } from '@heroku/heroku-cli-util';
+import { Command, flags } from '@heroku-cli/command';
 import { Args } from '@oclif/core';
 import { resolveAddon } from '../../lib/addons/resolve.js';
 import { formatPrice, formatState, grandfatheredPrice } from '../../lib/addons/util.js';

package/dist/commands/addons/plans.d.ts

@@ -1,13 +1,13 @@
 import { Command } from '@heroku-cli/command';
 export default class Plans extends Command {
-    static args: {
-        service: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
-    };
+    static topic: string;
     static description: string;
     static flags: {
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
-    static topic: string;
-    run(): Promise<void>;
+    static args: {
+        service: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
     private printMeteredPricingURL;
+    run(): Promise<void>;
 }

package/dist/commands/addons/plans.js

@@ -1,20 +1,23 @@
 import { Command, flags } from '@heroku-cli/command';
-import { hux } from '@heroku/heroku-cli-util';
 import { Args } from '@oclif/core';
+import { hux } from '@heroku/heroku-cli-util';
+import { formatPrice } from '../../lib/addons/util.js';
 import _ from 'lodash';
 import printf from 'printf';
-import { formatPrice } from '../../lib/addons/util.js';
 export default class Plans extends Command {
-    static args = {
-        service: Args.string({ description: 'unique identifier or globally unique name of the add-on', required: true }),
-    };
+    static topic = 'addons';
     static description = 'list all available plans for an add-on service';
     static flags = {
         json: flags.boolean({ description: 'output in json format' }),
     };
-    static topic = 'addons';
+    static args = {
+        service: Args.string({ required: true, description: 'unique identifier or globally unique name of the add-on' }),
+    };
+    printMeteredPricingURL(service) {
+        return printf(`https://elements.heroku.com/addons/${service}#pricing`);
+    }
     async run() {
-        const { args, flags } = await this.parse(Plans);
+        const { flags, args } = await this.parse(Plans);
         const { service } = args;
         let { body: plans } = await this.heroku.get(`/addon-services/${service}/plans`, {
             headers: {
@@ -26,7 +29,6 @@ export default class Plans extends Command {
             hux.styledJSON(plans);
         }
         else {
-            /* eslint-disable perfectionist/sort-objects */
             hux.table(plans, {
                 default: {
                     header: ' ', // <- This space is necessary to prevent the table header from rendering as "default"
@@ -47,10 +49,6 @@ export default class Plans extends Command {
                     get: (plan) => plan.price.metered ? this.printMeteredPricingURL(service) : formatPrice({ price: plan.price, hourly: false }),
                 },
             });
-            /* eslint-enable perfectionist/sort-objects */
         }
     }
-    printMeteredPricingURL(service) {
-        return printf(`https://elements.heroku.com/addons/${service}#pricing`);
-    }
 }

package/dist/commands/addons/wait.js

@@ -1,7 +1,7 @@
 import { Command, flags } from '@heroku-cli/command';
 import * as color from '@heroku/heroku-cli-util/color';
 import { Args, ux } from '@oclif/core';
-import { waitForAddonDeprovisioning, waitForAddonProvisioning } from '../../lib/addons/addons-wait.js';
+import { waitForAddonDeprovisioning, waitForAddonProvisioning } from '../../lib/addons/addons_wait.js';
 import { resolveAddon } from '../../lib/addons/resolve.js';
 import notify from '../../lib/notify.js';
 export default class Wait extends Command {

package/dist/commands/apps/create.js

@@ -1,6 +1,6 @@
+import { color, hux } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
 import { BuildpackCompletion, RegionCompletion, SpaceCompletion, StackCompletion, } from '@heroku-cli/command/lib/completions.js';
-import { color, hux } from '@heroku/heroku-cli-util';
 import { Args, ux } from '@oclif/core';
 import fs from 'fs-extra';
 import Git from '../../lib/git/git.js';
@@ -69,6 +69,7 @@ async function configureGitRemote(context, app) {
     const remoteUrl = git.httpGitUrl(app.name || '');
     if (!context.flags['no-remote'] && git.inGitRepo()) {
         await git.createRemote(context.flags.remote || 'heroku', remoteUrl);
+        await git.configureCredentialHelper();
     }
     return remoteUrl;
 }

package/dist/commands/apps/destroy.js

@@ -1,8 +1,8 @@
 import { Command, flags } from '@heroku-cli/command';
 import * as color from '@heroku/heroku-cli-util/color';
 import { Args, ux } from '@oclif/core';
-import { gitService } from '../../lib/ci/git.js';
-import ConfirmCommand from '../../lib/confirm-command.js';
+import * as git from '../../lib/ci/git.js';
+import ConfirmCommand from '../../lib/confirmCommand.js';
 export default class Destroy extends Command {
     static args = {
         app: Args.string({ hidden: true }),
@@ -30,15 +30,13 @@ export default class Destroy extends Command {
          * you want, and they can all point to the same url.
          * The only requirement is that the "name" is unique.
          */
-        if (gitService.inGitRepo()) {
+        if (git.inGitRepo()) {
             // delete git remotes pointing to this app
-            const remotes = await gitService.listRemotes();
-            // Deduplicate remote names (same name appears for fetch and push)
-            const names = new Set([
-                ...(remotes.get(gitService.gitUrl(app))?.map(({ name }) => name) ?? []),
-                ...(remotes.get(gitService.sshGitUrl(app))?.map(({ name }) => name) ?? []),
+            const remotes = await git.listRemotes();
+            await Promise.all([
+                remotes.get(git.gitUrl(app))?.map(({ name }) => git.rmRemote(name)),
+                remotes.get(git.sshGitUrl(app))?.map(({ name }) => git.rmRemote(name)),
             ]);
-            await Promise.all([...names].map(name => gitService.rmRemote(name)));
         }
         ux.action.stop();
     }