heroku 11.5.0-beta.0 → 11.6.0-beta.0

package/CHANGELOG.md

@@ -4,7 +4,74 @@ All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 
-## [11.5.0-beta.0](https://github.com/heroku/cli/compare/v11.4.0...v11.5.0-beta.0) (2026-06-11)
+## [11.6.0-beta.0](https://github.com/heroku/cli/compare/v11.5.0...v11.6.0-beta.0) (2026-06-15)
+
+
+### Features
+
+* add alias files for keychain accounts ([e1c572c](https://github.com/heroku/cli/commit/e1c572c942386b519b6ab63aac52c5ed56060d05))
+* add getAliasEmail helper method ([bb53b87](https://github.com/heroku/cli/commit/bb53b87479d3009518c02420027da1dc7b8ddace))
+* add listAliasFiles helper method ([01da5e4](https://github.com/heroku/cli/commit/01da5e44ae9c7257fddb27566fb3b3c02f7c8444))
+* adds alias support for keychain-based accounts ([#3752](https://github.com/heroku/cli/issues/3752)) ([c5d1a45](https://github.com/heroku/cli/commit/c5d1a450601405b44b23648593b498bf61de2b20))
+* adds credential manager functionality to the CLI ([#3758](https://github.com/heroku/cli/issues/3758)) ([ad0466e](https://github.com/heroku/cli/commit/ad0466e1512b902ee454fc55d4a5abdf87eaab12))
+* 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))
+* prevent duplicate aliases for same email in accounts:add ([c094aa6](https://github.com/heroku/cli/commit/c094aa61670a0beaa15d3c8a31e0839f082c50d5))
+* remove alias files for keychain and netrc accounts ([0d3b417](https://github.com/heroku/cli/commit/0d3b4175391b48ae84a712f9f86743a85ff2efbd))
+* 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 description for clarity ([a34d687](https://github.com/heroku/cli/commit/a34d687ecee13d4db831ef39011c9698d676bcb3))
+* 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))
+* update list() to merge keychain accounts with alias files ([940bb6f](https://github.com/heroku/cli/commit/940bb6f89326e26e176b199db8fe0defa141c29d))
+* update remove() to resolve alias before keychain removal ([92e2fe1](https://github.com/heroku/cli/commit/92e2fe133ca2d52f4c0b744c0096be2196fb106b))
+* update set() to handle aliased keychain accounts ([114d3a7](https://github.com/heroku/cli/commit/114d3a7740c7f1c10e1425c5d9c7613811182658))
+
+
+### Bug Fixes
+
+* allow switching to netrc mode with keychain-created aliases ([386bd16](https://github.com/heroku/cli/commit/386bd163b31cb2899d7d17332e79b0e68d63a5c0))
+* fix linting errors in accounts lib file ([a8368d6](https://github.com/heroku/cli/commit/a8368d696dc91552ffef901da286e003a3091596))
+* 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))
+* improves consistency between keychain and netrc accounts actions ([#3762](https://github.com/heroku/cli/issues/3762)) ([76d24b8](https://github.com/heroku/cli/commit/76d24b88247091325a59d37d77683a512e6f1724))
+* make getAliasEmail test cross-platform compatible ([0f5b958](https://github.com/heroku/cli/commit/0f5b958f4782cf2ec5b5cb53812bdd636cb436e9))
+* prevent cross-mode account removal with helpful error messages ([efa00a3](https://github.com/heroku/cli/commit/efa00a3e473eb2bb9be5a96f0412dced0851ec89))
+* prevent password from being written to keychain alias files ([4b0e92d](https://github.com/heroku/cli/commit/4b0e92d1045dc649c5b5d92b649fa9d8d613e267))
+* remove support for non-aliased accounts from heroku accounts and accounts:current commands ([9509171](https://github.com/heroku/cli/commit/950917138576dfae869bf5ef2930d9a159e7808b))
+* restore git configuration on logout ([#3697](https://github.com/heroku/cli/issues/3697)) ([5479fa5](https://github.com/heroku/cli/commit/5479fa53c75b152aece718999deee50b94b1f5ce))
+* update accounts:remove to check for email or alias to validate current account ([969afab](https://github.com/heroku/cli/commit/969afabbfaa46bfdaf37cac7eab854440fbcd601))
+* update error text for accounts commands ([a15d8bd](https://github.com/heroku/cli/commit/a15d8bd1f8b86b802b9c74efccf3de1136cc3483))
+* update error text for accounts commands ([#3756](https://github.com/heroku/cli/issues/3756)) ([35350e8](https://github.com/heroku/cli/commit/35350e89b86080fd415ad0c4c20928695fbac42b))
+* use HEROKU_CLI_CHANNEL in Direwolf test trigger ([#3765](https://github.com/heroku/cli/issues/3765)) ([62be38b](https://github.com/heroku/cli/commit/62be38b378e29a97246cc41c500d633fa8bf407c))
+
+
+### Miscellaneous Chores
+
+* fix linting errors ([7df4bf0](https://github.com/heroku/cli/commit/7df4bf076497d70c4c0ab3ae672598853f761247))
+* merge in main to feature branch ([#3747](https://github.com/heroku/cli/issues/3747)) ([8c100fd](https://github.com/heroku/cli/commit/8c100fd4667a88e414a4c9379ff896792ef07498))
+* merge main ([#3737](https://github.com/heroku/cli/issues/3737)) ([cb751e6](https://github.com/heroku/cli/commit/cb751e6a23d11baf44cd6111f7a1741e8477c06d))
+* merge main ([#3757](https://github.com/heroku/cli/issues/3757)) ([07a78a3](https://github.com/heroku/cli/commit/07a78a3d8023bd56c9b2935d98ffad61925be803))
+* update CLI analytics to use heroku credential manager ([#3685](https://github.com/heroku/cli/issues/3685)) ([5f86e4c](https://github.com/heroku/cli/commit/5f86e4cf9a6b8ca74d6ef0650abbae1f940fab7d))
+
+
+### Code Refactoring
+
+* add accountsDir() helper to reduce code duplication ([efff0f5](https://github.com/heroku/cli/commit/efff0f5acd9cd4554ba74eb96d611abd9f44c830))
+* always write to netrc and remove non-aliased account support from accounts:set ([1a6fdb1](https://github.com/heroku/cli/commit/1a6fdb1fd70d37fb40bd44e8761b1868cc7df59f))
+* clean up accounts commands and lib function ([b2619ac](https://github.com/heroku/cli/commit/b2619ac45d8ee85469851c90274105515c7c9f09))
+* extract Ruby symbol conversion to helper method ([dae3901](https://github.com/heroku/cli/commit/dae390196a0c3654cc8be22126bb48bedb022ed0))
+* remove cross-mode validation from accounts management ([aba7fa5](https://github.com/heroku/cli/commit/aba7fa5cb213ef6b54a078b1d28beafefe9b79b3))
+* simplify account lookup in set command ([c540bec](https://github.com/heroku/cli/commit/c540bec1ab5829e683f5296baa0806b427439605))
+* simplify accounts add to always write username and password ([5be6ed5](https://github.com/heroku/cli/commit/5be6ed5987146486e18bda5570d92ea461686b80))
+* simplify add() method with writeAccountFile helper ([b15db3a](https://github.com/heroku/cli/commit/b15db3ae0abf1ad92b20d14fb62c72039b1488c2))
+
+
+### Tests
+
+* fix accounts, apps, auth, buildpacks, container, git, and ps-exec tests ([391b6a6](https://github.com/heroku/cli/commit/391b6a6cff1cb754697db642f1c11464a8de6de3))
+* 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](https://github.com/heroku/cli/compare/v11.4.0...v11.5.0) (2026-06-11)
 
 
 ### Features

package/dist/commands/accounts/add.js

@@ -4,26 +4,24 @@ import { Args, ux } from '@oclif/core';
 import AccountsModule from '../../lib/accounts/accounts.js';
 export default class Add extends Command {
     static args = {
-        name: Args.string({ description: 'name of Heroku account to add', required: true }),
+        name: Args.string({ description: 'alias for Heroku account to add', required: true }),
     };
-    static description = 'add a Heroku account to your cache';
+    static description = 'add the current Heroku account to your accounts cache';
     static example = `${color.command('heroku accounts:add my-account')}`;
     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 existingAlias = accounts.find(account => account.name && account.username === email);
+        if (existingAlias) {
+            ux.error(`Account ${email} already has an alias of ${existingAlias.name}.`);
         }
+        const token = this.heroku.auth;
         AccountsModule.add(name, email, token);
     }
 }

package/dist/commands/accounts/current.js

@@ -8,12 +8,13 @@ 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)}`);
         }
         else {
-            ux.error(`You haven't set an account. Run ${color.code('heroku accounts:add <account-name>')} to add an account to your cache or ${color.code('heroku accounts:set <account-name>')} to set the current account.`);
+            ux.error(`You haven't set an account.\n
+      Run ${color.code('heroku accounts:add <account-name>')} to add an account to your cache or ${color.code('heroku accounts:set <account-name>')} to set the current account.`);
         }
     }
 }

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,16 @@ 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)) {
+        const accounts = await AccountsModule.list();
+        const account = accounts.find(a => a.name === name || a.username === name);
+        if (!account) {
             ux.error(`${name} doesn't exist in your accounts cache.`);
         }
-        if (await AccountsModule.current() === name) {
-            ux.error(`${name} is the current account.`);
+        const currentAccount = await AccountsModule.current(this.heroku);
+        // Check both alias (name) and email (username) against current account
+        if (currentAccount === name || currentAccount === account.username) {
+            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,18 @@ 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';
     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 account = accounts.find(account => account.name === name || account.username === name);
+        if (!account) {
+            ux.error(`${name} doesn't exist in your accounts cache.`);
         }
-        AccountsModule.set(name);
+        await AccountsModule.set(account, this.config.dataDir);
     }
 }

package/dist/commands/apps/create.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/auth/login.js

@@ -1,5 +1,6 @@
 import { Command, flags } from '@heroku-cli/command';
 import * as color from '@heroku/heroku-cli-util/color';
+import Git from '../../lib/git/git.js';
 export default class Login extends Command {
     static aliases = ['login'];
     static description = 'login with your Heroku credentials';
@@ -17,6 +18,14 @@ export default class Login extends Command {
         await this.heroku.login({ browser: flags.browser, expiresIn: flags['expires-in'], method });
         const { body: account } = await this.heroku.get('/account', { retryAuth: false });
         this.log(`Logged in as ${color.user(account.email)}`);
+        const git = new Git();
+        try {
+            await git.configureCredentialHelper();
+            await git.eraseCredentials();
+        }
+        catch {
+            // ignore
+        }
         await this.config.runHook('recache', { type: 'login' });
     }
 }

package/dist/commands/auth/logout.js

@@ -1,14 +1,28 @@
 import { Command } from '@heroku-cli/command';
 import { ux } from '@oclif/core/ux';
+import AccountsModule from '../../lib/accounts/accounts.js';
+import Git from '../../lib/git/git.js';
 export default class Logout extends Command {
     static aliases = ['logout'];
     static baseFlags = Command.baseFlagsWithoutPrompt();
     static description = 'clears local login credentials and invalidates API session';
     static promptFlagActive = false;
     async run() {
-        this.parse(Logout);
+        await this.parse(Logout);
         ux.action.start('Logging out');
+        const cachedNetrcAccount = await AccountsModule.currentNetrc();
         await this.heroku.logout();
+        const git = new Git();
+        try {
+            await git.removeCredentialHelper();
+            await git.eraseCredentials();
+        }
+        catch {
+            // ignore
+        }
+        if (cachedNetrcAccount) {
+            await AccountsModule.remove(cachedNetrcAccount);
+        }
         await this.config.runHook('recache', { type: 'logout' });
         ux.action.stop();
     }

package/dist/commands/auth/whoami.js

@@ -17,7 +17,7 @@ export default class AuthWhoami extends Command {
             this.log(account.email);
         }
         catch (error) {
-            if (error.statusCode === 401)
+            if (error.http.statusCode === 401)
                 this.notloggedin();
             throw error;
         }

package/dist/commands/ci/config/unset.js

@@ -27,7 +27,7 @@ export default class CiConfigUnset extends Command {
             vars[iAmStr] = null;
         }
         await ux.action.start(`Unsetting ${Object.keys(vars).join(', ')}`);
-        setPipelineConfigVars(this.heroku, pipeline.id, vars);
+        await setPipelineConfigVars(this.heroku, pipeline.id, vars);
         ux.action.stop();
     }
 }

package/dist/commands/git/clone.js

@@ -24,5 +24,6 @@ remote: Counting objects: 42, done.
         const directory = args.DIRECTORY || app.name;
         const remote = flags.remote || 'heroku';
         await git.spawn(['clone', '-o', remote, git.url(app.name), directory]);
+        await git.configureCredentialHelper();
     }
 }

package/dist/commands/git/credentials.d.ts

@@ -6,4 +6,10 @@ export declare class GitCredentials extends Command {
     static description: string;
     static hidden: boolean;
     run(): Promise<void>;
+    /**
+     * Reads git-credential input from stdin
+     * Format: key=value pairs, one per line, terminated by blank line
+     * Returns parsed object with protocol, host, username, and path
+     */
+    private readInput;
 }

package/dist/commands/git/credentials.js

@@ -1,5 +1,6 @@
-import { Command } from '@heroku-cli/command';
+import { Command, vars } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
+import * as readline from 'node:readline';
 export class GitCredentials extends Command {
     static args = {
         command: Args.string({ description: 'command name of the git credentials', required: true }),
@@ -16,10 +17,16 @@ export class GitCredentials extends Command {
                 break;
             }
             case 'get': {
-                if (!this.heroku.auth)
+                const { host, protocol } = await this.readInput();
+                const { httpGitHost } = vars;
+                if (protocol !== 'https' || host !== httpGitHost) {
+                    return;
+                }
+                if (!this.heroku.auth) {
                     throw new Error('not logged in');
+                }
                 ux.stdout(`protocol=https
-host=git.heroku.com
+host=${httpGitHost}
 username=heroku
 password=${this.heroku.auth}`);
                 break;
@@ -29,4 +36,32 @@ password=${this.heroku.auth}`);
             }
         }
     }
+    /**
+     * Reads git-credential input from stdin
+     * Format: key=value pairs, one per line, terminated by blank line
+     * Returns parsed object with protocol, host, username, and path
+     */
+    async readInput() {
+        return new Promise(resolve => {
+            const rl = readline.createInterface({
+                input: process.stdin,
+                terminal: false,
+            });
+            const input = {};
+            rl.on('line', (line) => {
+                if (!line.trim()) {
+                    rl.close();
+                    return;
+                }
+                const [key, value] = line.split('=', 2);
+                if (key && value) {
+                    input[key] = value;
+                }
+            });
+            rl.on('close', () => {
+                process.stdin.pause();
+                resolve(input);
+            });
+        });
+    }
 }

package/dist/commands/git/remote.js

@@ -34,5 +34,6 @@ ${color.command('heroku git:remote --remote heroku-staging -a example-staging')}
             : git.exec(['remote', 'add', remote, url].concat(argv)));
         const newRemote = await git.remoteUrl(remote);
         this.log(`set git remote ${color.cyan(remote)} to ${color.cyan(newRemote)}`);
+        await git.configureCredentialHelper();
     }
 }

package/dist/lib/accounts/accounts.d.ts

@@ -1,21 +1,35 @@
-import * as Heroku from '@heroku-cli/schema';
+import { APIClient, getStorageConfig } from '@heroku-cli/command';
+export interface AccountEntry {
+    name?: string;
+    username: string;
+}
 export interface IAccountsWrapper {
     add(name: string, username: string, password: string): void;
-    current(): Promise<null | string>;
-    list(): [] | Heroku.Account[];
+    current(heroku: APIClient): Promise<null | string>;
+    currentNetrc(): Promise<null | string>;
+    getStorageConfig(): ReturnType<typeof getStorageConfig>;
+    list(): AccountEntry[];
     remove(name: string): void;
-    set(name: string): Promise<void>;
+    set(account: AccountEntry, dataDir: string): Promise<void>;
+    writeLoginState(dataDir: string, name: string): Promise<void>;
 }
 export declare class AccountsWrapper implements IAccountsWrapper {
     private netrc;
     add(name: string, username: string, password: string): void;
-    current(): Promise<null | string>;
-    list(): [] | Heroku.Account[];
-    remove(name: string): void;
-    set(name: string): Promise<void>;
+    current(heroku: APIClient): Promise<null | string>;
+    currentNetrc(): Promise<null | string>;
+    getStorageConfig(): import("@heroku-cli/command").StorageConfig;
+    list(): AccountEntry[];
+    remove(name: string): Promise<void>;
+    set(account: AccountEntry, dataDir: string): Promise<void>;
+    writeLoginState(dataDir: string, name: string): Promise<void>;
     private account;
+    private accountsDir;
     private configDir;
+    private convertRubySymbols;
+    private getAliasEmail;
     private initNetrc;
+    private writeAccountFile;
 }
 declare const _default: AccountsWrapper;
 export default _default;

package/dist/lib/accounts/accounts.js

@@ -1,3 +1,5 @@
+import { getStorageConfig, writeLoginState, } from '@heroku-cli/command';
+import { removeAuth } from '@heroku-cli/command/lib/credential-manager.js';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
@@ -5,14 +7,20 @@ import { parse, stringify } from 'yaml';
 export class AccountsWrapper {
     netrc;
     add(name, username, password) {
-        const basedir = path.join(this.configDir(), 'accounts');
-        fs.mkdirSync(basedir, { recursive: true });
-        fs.writeFileSync(path.join(basedir, name), 
+        fs.mkdirSync(this.accountsDir(), { recursive: true });
         // eslint-disable-next-line perfectionist/sort-objects
-        stringify({ username, password }), 'utf8');
-        fs.chmodSync(path.join(basedir, name), 0o600);
+        this.writeAccountFile(name, { username, password });
     }
-    async current() {
+    async current(heroku) {
+        const config = this.getStorageConfig();
+        if (config.credentialStore) {
+            const authEntry = await heroku.getAuthEntry();
+            const current = this.list().find(a => a.username === authEntry?.account);
+            return current && current.name ? current.name : null;
+        }
+        return this.currentNetrc();
+    }
+    async currentNetrc() {
         const netrcInstance = await this.initNetrc();
         if (netrcInstance.machines['api.heroku.com']) {
             const current = this.list().find(a => a.username === netrcInstance.machines['api.heroku.com'].login);
@@ -20,40 +28,66 @@ export class AccountsWrapper {
         }
         return null;
     }
+    getStorageConfig() {
+        return getStorageConfig();
+    }
     list() {
-        const basedir = path.join(this.configDir(), 'accounts');
+        const basedir = this.accountsDir();
         try {
             return fs.readdirSync(basedir)
-                .map(name => Object.assign(this.account(name), { name }));
+                .filter(name => this.account(name).username)
+                .map(name => ({ name, username: this.account(name).username }));
         }
         catch {
             return [];
         }
     }
-    remove(name) {
-        const basedir = path.join(this.configDir(), 'accounts');
-        fs.unlinkSync(path.join(basedir, name));
+    async remove(name) {
+        const config = this.getStorageConfig();
+        if (config.credentialStore) {
+            // Keychain mode
+            const email = this.getAliasEmail(name);
+            await removeAuth(email, ['api.heroku.com', 'git.heroku.com']);
+            fs.unlinkSync(path.join(this.accountsDir(), name));
+            return;
+        }
+        // Netrc mode
+        fs.unlinkSync(path.join(this.accountsDir(), name));
     }
-    async set(name) {
-        const netrcInstance = await this.initNetrc();
-        const current = this.account(name);
-        netrcInstance.machines['git.heroku.com'] = { login: current.username, password: current.password };
-        netrcInstance.machines['api.heroku.com'] = { login: current.username, password: current.password };
-        await netrcInstance.save();
+    async set(account, dataDir) {
+        const config = this.getStorageConfig();
+        if (account.name) {
+            if (config.credentialStore) {
+                const email = this.getAliasEmail(account.name);
+                if (email) {
+                    await this.writeLoginState(dataDir, email);
+                }
+            }
+            const netrcInstance = await this.initNetrc();
+            let current;
+            try {
+                current = this.account(account.name);
+            }
+            catch {
+                throw new Error(`We can't find the alias file for ${account.name}.`);
+            }
+            netrcInstance.machines['git.heroku.com'] = { login: current.username, password: current.password || '' };
+            netrcInstance.machines['api.heroku.com'] = { login: current.username, password: current.password || '' };
+            await netrcInstance.save();
+        }
+    }
+    async writeLoginState(dataDir, name) {
+        return writeLoginState(dataDir, name);
     }
     account(name) {
-        const basedir = path.join(this.configDir(), 'accounts');
-        const file = fs.readFileSync(path.join(basedir, name), 'utf8');
+        const file = fs.readFileSync(path.join(this.accountsDir(), name), 'utf8');
         const account = parse(file);
-        if (account[':username']) {
-            // convert from ruby symbols
-            account.username = account[':username'];
-            account.password = account[':password'];
-            delete account[':username'];
-            delete account[':password'];
-        }
+        this.convertRubySymbols(account);
         return account;
     }
+    accountsDir() {
+        return path.join(this.configDir(), 'accounts');
+    }
     configDir() {
         const legacyDir = path.join(os.homedir(), '.heroku');
         if (fs.existsSync(legacyDir)) {
@@ -61,6 +95,29 @@ export class AccountsWrapper {
         }
         return path.join(os.homedir(), '.config', 'heroku');
     }
+    convertRubySymbols(account) {
+        if (account[':username']) {
+            account.username = account[':username'];
+            account.password = account[':password'];
+            delete account[':username'];
+            delete account[':password'];
+        }
+    }
+    getAliasEmail(alias) {
+        try {
+            const filePath = path.join(this.accountsDir(), alias);
+            if (!fs.existsSync(filePath)) {
+                return;
+            }
+            const file = fs.readFileSync(filePath, 'utf8');
+            const account = parse(file);
+            this.convertRubySymbols(account);
+            return account.username ?? undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
     async initNetrc() {
         if (!this.netrc) {
             const NetrcModule = await import('netrc-parser');
@@ -70,6 +127,11 @@ export class AccountsWrapper {
         }
         return this.netrc;
     }
+    writeAccountFile(name, content) {
+        const filePath = path.join(this.accountsDir(), name);
+        fs.writeFileSync(filePath, stringify(content), 'utf8');
+        fs.chmodSync(filePath, 0o600);
+    }
 }
 // Default export for convenience
 export default new AccountsWrapper();

package/dist/lib/analytics-telemetry/backboard-herokulytics-client.d.ts

@@ -26,15 +26,11 @@ export default class BackboardHerokulyticsClient {
     config: Interfaces.Config;
     http: ReturnType<typeof HTTP.create>;
     userConfig: HerokulyticsConfig;
+    private heroku;
     private isInitialized;
-    private netrc;
     constructor(config: Interfaces.Config);
     get authorizationToken(): string | undefined;
-    get netrcLogin(): string | undefined;
-    get netrcToken(): string | undefined;
     get url(): string;
-    get user(): string | undefined;
-    get usingHerokuAPIKey(): boolean;
     _acAnalytics(id: string): Promise<number>;
     send(opts: RecordOpts): Promise<void>;
     private ensureInitialized;