heroku 11.5.0-alpha.6 → 11.5.0-beta.0

package/CHANGELOG.md

@@ -4,47 +4,32 @@ All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 
-## [11.5.0-alpha.6](https://github.com/heroku/cli/compare/v11.4.0...v11.5.0-alpha.6) (2026-06-04)
+## [11.5.0-beta.0](https://github.com/heroku/cli/compare/v11.4.0...v11.5.0-beta.0) (2026-06-11)
 
 
 ### Features
 
 * add hidden --method flag to data:pg:migrate ([#3743](https://github.com/heroku/cli/issues/3743)) ([665b189](https://github.com/heroku/cli/commit/665b1896d50f399cc20cfe39500b603665bc814a))
-* 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
 
 * 'run:inside' args ordering (W-22693654) ([#3727](https://github.com/heroku/cli/issues/3727)) ([355113e](https://github.com/heroku/cli/commit/355113e8253b8547ea86be4ef540287ea263af80))
 * add missing warning to 'data:pg:migrate' (W-22544849) ([#3716](https://github.com/heroku/cli/issues/3716)) ([400fc6e](https://github.com/heroku/cli/commit/400fc6e26eb7b7fdd634e0e4465fc5c19762303a))
-* 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))
+* call _heroku.pg_stat_statements_reset() on Essential and Advanced plans ([#3751](https://github.com/heroku/cli/issues/3751)) ([5414e36](https://github.com/heroku/cli/commit/5414e3621ae732124bafcc9fdd1eabb56fc81c9d))
 * inherit secrets in reusable workflow ([#3711](https://github.com/heroku/cli/issues/3711)) ([5dd58af](https://github.com/heroku/cli/commit/5dd58af6c14f55ab85fe8584598718ebee03ae4b))
 * pass empty string to rl.write in repl finally block (W-22295448) ([#3721](https://github.com/heroku/cli/issues/3721)) ([ebdf082](https://github.com/heroku/cli/commit/ebdf082ed317cb74a59945c60dc274615b735b81))
-* restore git configuration on logout ([#3697](https://github.com/heroku/cli/issues/3697)) ([5479fa5](https://github.com/heroku/cli/commit/5479fa53c75b152aece718999deee50b94b1f5ce))
 
 
 ### Miscellaneous Chores
 
 * add CLAUDE.md and Copilot instructions pointing to AGENTS.md ([#3724](https://github.com/heroku/cli/issues/3724)) ([8abed2f](https://github.com/heroku/cli/commit/8abed2faad739a1897734fe414cc2e1b70ea245a))
 * consolidate release for trusted publishing ([#3744](https://github.com/heroku/cli/issues/3744)) ([0e81dd8](https://github.com/heroku/cli/commit/0e81dd8429cecba42ea31c64cbbaac9db2bd2f87))
-* 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))
+* inline npm publish workflow ([#3750](https://github.com/heroku/cli/issues/3750)) ([5618ee2](https://github.com/heroku/cli/commit/5618ee2e161f71594305de28965d672cf4eba8f3))
+* pass PR title via env in pr-title-check workflow ([#3763](https://github.com/heroku/cli/issues/3763)) ([96310c3](https://github.com/heroku/cli/commit/96310c372b3431aa0c6b4c9313d035b40c7cd0bd))
 * remove unused workflow file ([#3712](https://github.com/heroku/cli/issues/3712)) ([8860aa4](https://github.com/heroku/cli/commit/8860aa412261f05fae3df19438cfd50a5f4ae67f))
-* update CLI analytics to use heroku credential manager ([#3685](https://github.com/heroku/cli/issues/3685)) ([5f86e4c](https://github.com/heroku/cli/commit/5f86e4cf9a6b8ca74d6ef0650abbae1f940fab7d))
 * upload arm64 win installer to Stampy unsigned bucket (W-22733412) ([#3734](https://github.com/heroku/cli/issues/3734)) ([e171ad5](https://github.com/heroku/cli/commit/e171ad5f670bb4d7aae80d625ae5bf65d77cd1ff))
 
-
-### 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.4.0](https://github.com/heroku/cli/compare/v11.3.0...v11.4.0) (2026-05-13)
 
 

package/dist/commands/accounts/add.js

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

package/dist/commands/accounts/index.js

@@ -8,17 +8,16 @@ export default class AccountsIndex extends Command {
     static example = `${color.command('heroku accounts')}`;
     static promptFlagActive = false;
     async run() {
-        const accounts = await accountsModule.list();
+        const accounts = 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 === current || account.username === current) {
-                ux.stdout(`* ${account.name ?? account.username}`);
+            if (account.name === await accountsModule.current()) {
+                ux.stdout(`* ${account.name}`);
             }
             else {
-                ux.stdout(`  ${account.name ?? account.username}`);
+                ux.stdout(`  ${account.name}`);
             }
         }
     }

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 (!(await AccountsModule.list()).some(account => account.name === name || account.username === name)) {
+        if (!AccountsModule.list().some(a => a.name === name)) {
             ux.error(`${name} doesn't exist in your accounts cache.`);
         }
-        if (await AccountsModule.current(this.heroku) === name) {
-            ux.error(`${name} is the current account. To log out, run ${color.command('heroku logout')}.`);
+        if (await AccountsModule.current() === name) {
+            ux.error(`${name} is the current account.`);
         }
-        await AccountsModule.remove(name);
+        AccountsModule.remove(name);
     }
 }

package/dist/commands/accounts/set.js

@@ -4,20 +4,16 @@ 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 or username of account to set', required: true }),
+        name: Args.string({ description: 'name of account to set', required: true }),
     };
-    static description = 'set the current Heroku account from your accounts cache or system keychain';
+    static description = 'set the current Heroku account from your cache';
     static example = `${color.command('heroku accounts:set my-account')}`;
     async run() {
         const { args } = await this.parse(Set);
         const { name } = args;
-        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.`);
+        if (!AccountsModule.list().some(a => a.name === name)) {
+            ux.error(`${name} does not exist in your accounts cache.`);
         }
-        const account = netrcAccount ?? keychainAccount;
-        await AccountsModule.set(account, this.config.dataDir);
+        AccountsModule.set(name);
     }
 }

package/dist/commands/apps/create.js

@@ -69,7 +69,6 @@ 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,6 +1,5 @@
 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';
@@ -18,14 +17,6 @@ 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,28 +1,14 @@
 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() {
-        await this.parse(Logout);
+        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) {
-            AccountsModule.removeNetrc(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.http.statusCode === 401)
+            if (error.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(', ')}`);
-        await setPipelineConfigVars(this.heroku, pipeline.id, vars);
+        setPipelineConfigVars(this.heroku, pipeline.id, vars);
         ux.action.stop();
     }
 }

package/dist/commands/git/clone.js

@@ -24,6 +24,5 @@ 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,10 +6,4 @@ 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,6 +1,5 @@
-import { Command, vars } from '@heroku-cli/command';
+import { Command } 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 }),
@@ -17,16 +16,10 @@ export class GitCredentials extends Command {
                 break;
             }
             case 'get': {
-                const { host, protocol } = await this.readInput();
-                const { httpGitHost } = vars;
-                if (protocol !== 'https' || host !== httpGitHost) {
-                    return;
-                }
-                if (!this.heroku.auth) {
+                if (!this.heroku.auth)
                     throw new Error('not logged in');
-                }
                 ux.stdout(`protocol=https
-host=${httpGitHost}
+host=git.heroku.com
 username=heroku
 password=${this.heroku.auth}`);
                 break;
@@ -36,32 +29,4 @@ 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,6 +34,5 @@ ${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/commands/pg/outliers.js

@@ -78,7 +78,10 @@ export default class Outliers extends Command {
         const version = await fetchVersion(db);
         await this.ensurePGStatStatement();
         if (reset) {
-            await this.psqlService.execQuery('SELECT pg_stat_statements_reset();');
+            const resetFn = utils.pg.isEssentialDatabase(db.attachment.addon) || utils.pg.isAdvancedDatabase(db.attachment.addon)
+                ? '_heroku.pg_stat_statements_reset()'
+                : 'pg_stat_statements_reset()';
+            await this.psqlService.execQuery(`SELECT ${resetFn};`);
             return;
         }
         let limit = 10;

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

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

package/dist/lib/accounts/accounts.js

@@ -1,5 +1,3 @@
-import { getStorageConfig, listKeychainAccounts, 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';
@@ -7,86 +5,41 @@ import { parse, stringify } from 'yaml';
 export class AccountsWrapper {
     netrc;
     add(name, username, password) {
-        const config = this.getStorageConfig();
-        if (config.useNetrc) {
-            const basedir = path.join(this.configDir(), 'accounts');
-            fs.mkdirSync(basedir, { recursive: true });
-            fs.writeFileSync(path.join(basedir, name), 
-            // eslint-disable-next-line perfectionist/sort-objects
-            stringify({ username, password }), 'utf8');
-            fs.chmodSync(path.join(basedir, name), 0o600);
-        }
-    }
-    async current(heroku) {
-        const config = this.getStorageConfig();
-        if (config.credentialStore) {
-            const authEntry = await heroku.getAuthEntry();
-            return authEntry?.account ?? null;
-        }
-        return this.currentNetrc();
+        const basedir = path.join(this.configDir(), 'accounts');
+        fs.mkdirSync(basedir, { recursive: true });
+        fs.writeFileSync(path.join(basedir, name), 
+        // eslint-disable-next-line perfectionist/sort-objects
+        stringify({ username, password }), 'utf8');
+        fs.chmodSync(path.join(basedir, name), 0o600);
     }
-    async currentNetrc() {
+    async current() {
         const netrcInstance = await this.initNetrc();
         if (netrcInstance.machines['api.heroku.com']) {
-            const current = this.listNetrc().find(a => a.username === netrcInstance.machines['api.heroku.com'].login);
+            const current = this.list().find(a => a.username === netrcInstance.machines['api.heroku.com'].login);
             return current && current.name ? current.name : null;
         }
         return null;
     }
-    async getKeychainAccounts() {
-        return listKeychainAccounts();
-    }
-    getStorageConfig() {
-        return getStorageConfig();
-    }
-    async list() {
-        const config = this.getStorageConfig();
-        if (config.credentialStore) {
-            const accounts = await this.getKeychainAccounts();
-            return accounts
-                .filter((account) => account !== null && account !== undefined)
-                .map(account => ({ username: account }));
-        }
-        return this.listNetrc();
-    }
-    listNetrc() {
+    list() {
         const basedir = path.join(this.configDir(), 'accounts');
         try {
             return fs.readdirSync(basedir)
-                .map(name => ({ name, username: this.account(name).username ?? '' }));
+                .map(name => Object.assign(this.account(name), { name }));
         }
         catch {
             return [];
         }
     }
-    async remove(name) {
-        const config = this.getStorageConfig();
-        if (config.credentialStore) {
-            await removeAuth(name, ['api.heroku.com', 'git.heroku.com']);
-            return;
-        }
-        this.removeNetrc(name);
-    }
-    removeNetrc(name) {
+    remove(name) {
         const basedir = path.join(this.configDir(), 'accounts');
         fs.unlinkSync(path.join(basedir, name));
     }
-    async set(account, dataDir) {
-        const config = this.getStorageConfig();
-        if (config.credentialStore && !account.name) {
-            await this.writeLoginState(dataDir, account.username);
-            return;
-        }
-        if (config.useNetrc && account.name) {
-            const netrcInstance = await this.initNetrc();
-            const current = this.account(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);
+    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();
     }
     account(name) {
         const basedir = path.join(this.configDir(), 'accounts');

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

@@ -26,11 +26,15 @@ 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;

package/dist/lib/analytics-telemetry/backboard-herokulytics-client.js

@@ -1,4 +1,4 @@
-import { APIClient } from '@heroku-cli/command';
+import { vars } from '@heroku-cli/command';
 import { HTTP } from '@heroku/http-call';
 import fs from 'fs-extra';
 import path from 'node:path';
@@ -8,8 +8,8 @@ export default class BackboardHerokulyticsClient {
     config;
     http;
     userConfig;
-    heroku;
     isInitialized = false;
+    netrc;
     constructor(config) {
         this.config = config;
         this.http = HTTP.create({
@@ -17,11 +17,26 @@ export default class BackboardHerokulyticsClient {
         });
     }
     get authorizationToken() {
-        return this.heroku.auth;
+        return process.env.HEROKU_API_KEY || this.netrcToken;
+    }
+    get netrcLogin() {
+        return this.netrc?.machines[vars.apiHost]?.login;
+    }
+    get netrcToken() {
+        return this.netrc?.machines[vars.apiHost]?.password;
     }
     get url() {
         return process.env.HEROKU_ANALYTICS_URL || 'https://backboard.heroku.com/hamurai';
     }
+    get user() {
+        if (this.usingHerokuAPIKey)
+            return undefined;
+        return this.netrcLogin;
+    }
+    get usingHerokuAPIKey() {
+        const k = process.env.HEROKU_API_KEY;
+        return Boolean(k && k.length > 0);
+    }
     async _acAnalytics(id) {
         if (id === 'autocomplete:options')
             return 0;
@@ -95,8 +110,10 @@ export default class BackboardHerokulyticsClient {
         }
         telemetryDebug('Initializing Herokulytics client...');
         this.isInitialized = true;
-        this.heroku = new APIClient(this.config);
-        await this.heroku.getAuth();
+        const NetrcModule = await import('netrc-parser');
+        const NetrcClass = NetrcModule.Netrc || NetrcModule.default.constructor;
+        this.netrc = new NetrcClass();
+        await this.netrc.load();
         this.userConfig = new HerokulyticsConfig(this.config);
         await this.userConfig.init();
         telemetryDebug('Herokulytics client initialized (install_id: %s)', this.userConfig.install);

package/dist/lib/git/git.d.ts

@@ -1,20 +1,12 @@
-import cp from 'node:child_process';
 export default class Git {
-    private readonly execFile;
-    /** Configures `heroku git:credentials` as a Git credential helper
-    * that is URL-scoped to Heroku Git operations only.
-    */
-    configureCredentialHelper(): Promise<void>;
     createRemote(remote: string, url: string): Promise<string | null>;
-    /** Erases stored credentials for the Heroku Git host */
-    eraseCredentials(): Promise<void>;
     exec(args: string[]): Promise<string>;
     getBranch(symbolicRef: string): Promise<string>;
     getCommitTitle(ref: string): Promise<string>;
     getRef(branch: string): Promise<string>;
     hasGitRemote(remote: string): Promise<boolean>;
     httpGitUrl(app: string): string;
-    inGitRepo(): boolean;
+    inGitRepo(): true | undefined;
     readCommit(commit: string): Promise<{
         branch: string;
         message: string;
@@ -22,11 +14,6 @@ export default class Git {
     }>;
     remoteFromGitConfig(): Promise<string | void>;
     remoteUrl(name: string): Promise<string>;
-    /** Removes `heroku git:credentials` from the global config */
-    removeCredentialHelper(): Promise<void>;
-    spawn(args: string[], options?: {
-        input?: string;
-        stdio?: cp.StdioOptions;
-    }): Promise<unknown>;
+    spawn(args: string[]): Promise<unknown>;
     url(app: string): string;
 }