@hubspot/cli 8.2.0 → 8.2.1-experimental.0

package/commands/project/info.js

@@ -0,0 +1,70 @@
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
+import { debugError } from '../../lib/errorHandlers/index.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+import { commands } from '../../lang/en.js';
+import { getProjectConfig } from '../../lib/projects/config.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
+import { getProjectInfo, logProjectInfo, } from '../../lib/projects/projectInfo.js';
+import { ProjectInfoSchema, } from '../../lib/jsonOutput.js';
+const command = 'info';
+const describe = commands.project.info.describe;
+const verboseDescribe = commands.project.info.verboseDescribe;
+async function handler(args) {
+    const { derivedAccountId, formatOutputAsJson, exit, addJsonOutput } = args;
+    const { projectConfig } = await getProjectConfig();
+    if (!projectConfig) {
+        uiLogger.error(commands.project.info.errors.noProjectConfig);
+        return exit(EXIT_CODES.ERROR);
+    }
+    if (isLegacyProject(projectConfig.platformVersion)) {
+        uiLogger.error(commands.project.info.errors.unsupportedPlatformVersion(projectConfig.platformVersion));
+        return exit(EXIT_CODES.ERROR);
+    }
+    const projectName = projectConfig.name;
+    let project;
+    try {
+        const response = await fetchProject(derivedAccountId, projectName);
+        project = response.data;
+    }
+    catch (error) {
+        debugError(error);
+        uiLogger.error(commands.project.info.errors.projectNotFound(projectName, derivedAccountId));
+        return exit(EXIT_CODES.ERROR);
+    }
+    const deployedBuild = project.deployedBuild;
+    if (!deployedBuild) {
+        uiLogger.error(commands.project.info.errors.noDeployedBuild);
+        return exit(EXIT_CODES.ERROR);
+    }
+    const projectInfo = await getProjectInfo(project, projectConfig.platformVersion, derivedAccountId);
+    addJsonOutput(projectInfo);
+    if (!formatOutputAsJson) {
+        logProjectInfo(projectInfo);
+    }
+}
+function projectInfoBuilder(yargs) {
+    yargs.example([
+        ['$0 project info', commands.project.info.examples.default],
+        ['$0 project info --json', commands.project.info.examples.json],
+    ]);
+    return yargs;
+}
+const builder = makeYargsBuilder(projectInfoBuilder, command, verboseDescribe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+    useJSONOutputOptions: true,
+});
+const projectInfoCommand = {
+    command,
+    describe,
+    handler: makeWrappedYargsHandler('project-info', handler, {
+        jsonOutputSchema: ProjectInfoSchema,
+    }),
+    builder,
+};
+export default projectInfoCommand;

package/commands/project/installApp.d.ts

@@ -0,0 +1,8 @@
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
+import { InstallAppJsonOutput } from '../../lib/jsonOutput.js';
+export type ProjectInstallAppArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs<InstallAppJsonOutput> & {
+    force: boolean;
+    profile?: string;
+};
+declare const projectInstallAppCommand: YargsCommandModule<unknown, ProjectInstallAppArgs>;
+export default projectInstallAppCommand;

package/commands/project/installApp.js

@@ -0,0 +1,180 @@
+import { getConfigAccountIfExists } from '@hubspot/local-dev-lib/config';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
+import { InstallAppSchema, } from '../../lib/jsonOutput.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { commands } from '../../lang/en.js';
+import { getProjectConfig } from '../../lib/projects/config.js';
+import { APP_INSTALLATION_STATES } from '../../lib/constants.js';
+import { getAppInstallationState } from '../../lib/app/install.js';
+import { confirmInstallAppAction, fetchProjectAppInstallationData, installStaticAuthAppForAccount, loadInstallableAppNode, resolveAppMetadata, resolveProjectId, resolveProjectAccountId, resolveValidInstallAccount, } from '../../lib/projects/installApp.js';
+const command = 'install-app';
+const describe = commands.project.installApp.describe;
+const verboseDescribe = commands.project.installApp.verboseDescribe;
+async function handler(args) {
+    const { derivedAccountId, formatOutputAsJson, force, profile: profileOption, useEnv: useEnvOption, exit, addJsonOutput, } = args;
+    const { projectConfig, projectDir } = await getProjectConfig();
+    if (!projectConfig || !projectDir) {
+        uiLogger.error(commands.project.installApp.errors.noProjectConfig);
+        return exit(EXIT_CODES.ERROR);
+    }
+    if (isLegacyProject(projectConfig.platformVersion)) {
+        uiLogger.error(commands.project.installApp.errors.unsupportedPlatformVersion(projectConfig.platformVersion));
+        return exit(EXIT_CODES.ERROR);
+    }
+    const resolvedProjectAccount = await resolveProjectAccountId(derivedAccountId, projectConfig, projectDir, profileOption, !!useEnvOption);
+    if (resolvedProjectAccount === null) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    const appNode = await loadInstallableAppNode(projectConfig, projectDir, resolvedProjectAccount.accountId, force);
+    if (!appNode) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    const installAccountId = await resolveValidInstallAccount(resolvedProjectAccount.accountId, force, Boolean(formatOutputAsJson));
+    if (installAccountId === null) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    const targetAccountConfig = getConfigAccountIfExists(installAccountId);
+    // A profile only applies if we didn't switch away from its account.
+    const uploadProfile = installAccountId === resolvedProjectAccount.accountId
+        ? resolvedProjectAccount.profileName
+        : undefined;
+    const projectId = await resolveProjectId({
+        accountId: installAccountId,
+        projectConfig,
+        projectDir,
+        profile: uploadProfile,
+        force,
+        formatOutputAsJson: Boolean(formatOutputAsJson),
+    });
+    if (projectId === null) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    const installationData = await fetchProjectAppInstallationData(installAccountId, projectId, appNode, projectConfig);
+    if (installationData === null) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    let appId = installationData.appId;
+    const { isInstalledWithScopeGroups, previouslyAuthorizedScopeGroups } = installationData;
+    const needsReinstall = !isInstalledWithScopeGroups && previouslyAuthorizedScopeGroups.length > 0;
+    const installationState = getAppInstallationState(isInstalledWithScopeGroups, previouslyAuthorizedScopeGroups);
+    if (isInstalledWithScopeGroups) {
+        addJsonOutput({
+            appId,
+            appUid: appNode.uid,
+            accountId: installAccountId,
+            projectId,
+            installationState,
+            installed: true,
+            reinstalled: false,
+        });
+        if (!formatOutputAsJson) {
+            uiLogger.success(commands.project.installApp.alreadyInstalled(appNode.config.name, installAccountId));
+        }
+        return exit(EXIT_CODES.SUCCESS);
+    }
+    const shouldInstall = await confirmInstallAppAction({
+        appName: appNode.config.name,
+        targetAccountId: installAccountId,
+        force,
+        needsReinstall,
+    });
+    if (!shouldInstall) {
+        return exit(EXIT_CODES.SUCCESS);
+    }
+    const metadata = await resolveAppMetadata({
+        appId,
+        projectId,
+        appUid: appNode.uid,
+        appName: appNode.config.name,
+        accountId: installAccountId,
+        projectConfig,
+        projectDir,
+        profile: uploadProfile,
+        force,
+        formatOutputAsJson: Boolean(formatOutputAsJson),
+    });
+    if (metadata === null) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    appId = metadata.appId;
+    const installed = await installStaticAuthAppForAccount({
+        appId,
+        appNode,
+        appName: appNode.config.name,
+        targetAccountId: installAccountId,
+        targetAccountConfig,
+        projectId,
+        projectName: projectConfig.name,
+        scopeGroupIds: metadata.scopeGroupIds,
+        ownerPortalId: metadata.ownerPortalId,
+        installationState,
+        formatOutputAsJson: Boolean(formatOutputAsJson),
+    });
+    if (!installed) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    addJsonOutput({
+        appId,
+        appUid: appNode.uid,
+        accountId: installAccountId,
+        projectId,
+        installationState: APP_INSTALLATION_STATES.INSTALLED,
+        installed: true,
+        reinstalled: needsReinstall,
+    });
+    if (!formatOutputAsJson) {
+        uiLogger.success(commands.project.installApp.success(appNode.config.name, installAccountId));
+    }
+    return exit(EXIT_CODES.SUCCESS);
+}
+function projectInstallAppBuilder(yargs) {
+    yargs.options({
+        force: {
+            alias: ['f'],
+            describe: commands.project.installApp.options.force,
+            default: false,
+            type: 'boolean',
+        },
+        profile: {
+            alias: 'p',
+            describe: commands.project.installApp.options.profile,
+            type: 'string',
+        },
+    });
+    yargs.conflicts('profile', 'account');
+    yargs.example([
+        ['$0 project install-app', commands.project.installApp.examples.default],
+        [
+            '$0 project install-app --account=12345678',
+            commands.project.installApp.examples.withAccount,
+        ],
+        [
+            '$0 project install-app --profile=qa',
+            commands.project.installApp.examples.withProfile,
+        ],
+        [
+            '$0 project install-app --json',
+            commands.project.installApp.examples.json,
+        ],
+    ]);
+    return yargs;
+}
+const builder = makeYargsBuilder(projectInstallAppBuilder, command, verboseDescribe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+    useJSONOutputOptions: true,
+});
+const projectInstallAppCommand = {
+    command,
+    describe,
+    handler: makeWrappedYargsHandler('project-install-app', handler, {
+        jsonOutputSchema: InstallAppSchema,
+    }),
+    builder,
+};
+export default projectInstallAppCommand;

package/commands/project/installDeps.js

@@ -1,23 +1,24 @@
 import { installPackages, getProjectPackageJsonLocations, } from '../../lib/dependencyManagement.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import path from 'path';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { showMcpPromotionNudge } from '../../lib/mcp/promotion.js';
 const command = 'install-deps [packages..]';
 const describe = commands.project.installDeps.help.describe;
 async function handler(args) {
-    const { derivedAccountId, packages } = args;
+    const { packages, exit } = args;
     try {
-        trackCommandUsage('project-install-deps', undefined, derivedAccountId);
         const projectConfig = await getProjectConfig();
         if (!projectConfig || !projectConfig.projectDir) {
             uiLogger.error(commands.project.installDeps.noProjectConfig);
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         const { projectDir } = projectConfig;
         let installLocations = await getProjectPackageJsonLocations();
@@ -48,10 +49,14 @@ async function handler(args) {
             packages,
             installLocations,
         });
+        await showMcpPromotionNudge(args._.join(' '));
     }
     catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
         logError(e);
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function projectInstallDepsBuilder(yargs) {
@@ -74,7 +79,7 @@ const builder = makeYargsBuilder(projectInstallDepsBuilder, command, describe, {
 const projectInstallDepsCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('project-install-deps', handler),
     builder,
 };
 export default projectInstallDepsCommand;

package/commands/project/lint.js

@@ -1,33 +1,35 @@
 import path from 'path';
-import { getProjectPackageJsonLocations, installPackages, } from '../../lib/dependencyManagement.js';
+import { installPackages } from '../../lib/dependencyManagement.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import SpinniesManager from '../../lib/ui/SpinniesManager.js';
-import { areAllLintPackagesInstalled, getMissingLintPackages, lintPackages, displayLintResults, hasEslintConfig, hasDeprecatedEslintConfig, getDeprecatedEslintConfigFiles, createEslintConfig, REQUIRED_PACKAGES_AND_MIN_VERSIONS, } from '../../lib/projects/uieLinting.js';
+import { addLintScriptsToPackageJson, areAllLintPackagesInstalled, createEslintConfig, displayLintResults, getDeprecatedEslintConfigFiles, getMissingLintPackages, getMissingLintScripts, getUieLintablePackageJsonLocations, hasDeprecatedEslintConfig, hasEslintConfig, lintPackages, REQUIRED_PACKAGES_AND_MIN_VERSIONS, } from '../../lib/projects/uieLinting.js';
+import { clearPackageJsonCache } from '../../lib/npm/packageJson.js';
 const command = 'lint';
 const describe = commands.project.lint.help.describe;
 async function handler(args) {
-    const { derivedAccountId, installMissingDeps } = args;
+    const { installMissingDeps, exit } = args;
     try {
-        trackCommandUsage('project-lint', undefined, derivedAccountId);
         const projectConfig = await getProjectConfig();
         if (!projectConfig || !projectConfig.projectDir) {
             uiLogger.error(commands.project.lint.noProjectConfig);
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         SpinniesManager.init({ succeedColor: 'white' });
         SpinniesManager.add('lintCheck', {
             text: commands.project.lint.loading.checking,
         });
-        const lintLocations = await getProjectPackageJsonLocations();
+        const lintLocations = await getUieLintablePackageJsonLocations(projectConfig);
         const locationsReadyToLint = [];
         const locationsNeedingPackages = new Map();
+        let skippedDirectoryCount = 0;
         for (const lintLocation of lintLocations) {
             if (areAllLintPackagesInstalled(lintLocation)) {
                 locationsReadyToLint.push(lintLocation);
@@ -69,6 +71,7 @@ async function handler(args) {
                     installLocations: locationsArray,
                     dev: true,
                 });
+                clearPackageJsonCache();
                 // Re-check which locations are now ready
                 for (const location of locationsArray) {
                     if (areAllLintPackagesInstalled(location)) {
@@ -78,6 +81,9 @@ async function handler(args) {
             }
             else {
                 uiLogger.warn(commands.project.lint.skippingDirectoriesWarning(relativeLocations));
+                if (installMissingDeps === false) {
+                    skippedDirectoryCount = relativeLocations.length;
+                }
             }
         }
         if (locationsReadyToLint.length > 0) {
@@ -117,9 +123,10 @@ async function handler(args) {
                     SpinniesManager.add('lintConfigCreate', {
                         text: commands.project.lint.loading.creatingConfig,
                     });
+                    const platformVersion = projectConfig.projectConfig?.platformVersion ?? null;
                     const createdConfigs = [];
                     for (const location of locationsNeedingConfig) {
-                        const configPath = createEslintConfig(location);
+                        const configPath = await createEslintConfig(location, platformVersion);
                         createdConfigs.push(configPath);
                     }
                     SpinniesManager.succeed('lintConfigCreate');
@@ -129,8 +136,25 @@ async function handler(args) {
                 }
                 else {
                     uiLogger.error(commands.project.lint.eslintConfigRequired);
-                    return process.exit(EXIT_CODES.ERROR);
+                    return exit(EXIT_CODES.ERROR);
+                }
+            }
+            const locationsNeedingScripts = locationsReadyToLint.filter(location => getMissingLintScripts(location).length > 0);
+            if (locationsNeedingScripts.length > 0) {
+                SpinniesManager.add('lintScriptsAdd', {
+                    text: commands.project.lint.loading.addingLintScripts,
+                });
+                const addedResults = [];
+                for (const location of locationsNeedingScripts) {
+                    const result = addLintScriptsToPackageJson(location);
+                    if (result.added.length > 0) {
+                        addedResults.push(result);
+                    }
                 }
+                SpinniesManager.succeed('lintScriptsAdd');
+                addedResults.forEach(({ added, relativePath }) => {
+                    uiLogger.success(commands.project.lint.lintScriptsAdded(added, relativePath));
+                });
             }
             SpinniesManager.add('lintRun', {
                 text: commands.project.lint.loading.linting,
@@ -139,13 +163,20 @@ async function handler(args) {
             SpinniesManager.succeed('lintRun');
             displayLintResults(results);
             if (!success) {
-                return process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
         }
+        if (skippedDirectoryCount > 0) {
+            uiLogger.error(commands.project.lint.skippedDirectoriesError(skippedDirectoryCount));
+            return exit(EXIT_CODES.ERROR);
+        }
     }
     catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
         logError(e);
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function projectLintBuilder(yargs) {
@@ -172,7 +203,7 @@ const builder = makeYargsBuilder(projectLintBuilder, command, describe, {
 const projectLintCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('project-lint', handler),
     builder,
 };
 export default projectLintCommand;

package/commands/project/list.d.ts

@@ -1,4 +1,4 @@
-import { AccountArgs, CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs.js';
-type ProjectListArgs = CommonArgs & ConfigArgs & AccountArgs;
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs.js';
+type ProjectListArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
 declare const projectListCommand: YargsCommandModule<unknown, ProjectListArgs>;
 export default projectListCommand;

package/commands/project/list.js

@@ -1,4 +1,4 @@
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { fetchProjects } from '@hubspot/local-dev-lib/api/projects';
 import { logError } from '../../lib/errorHandlers/index.js';
@@ -9,14 +9,8 @@ import { renderTable } from '../../ui/render.js';
 const command = ['list', 'ls'];
 const describe = commands.project.list.describe;
 async function getProjectData(accountId) {
-    try {
-        const { data: projects } = await fetchProjects(accountId);
-        return projects.results;
-    }
-    catch (e) {
-        logError(e);
-        process.exit(EXIT_CODES.ERROR);
-    }
+    const { data: projects } = await fetchProjects(accountId);
+    return projects.results;
 }
 function formatProjectsAsTableRows(projects) {
     const projectListData = [];
@@ -29,12 +23,18 @@ function formatProjectsAsTableRows(projects) {
     return projectListData;
 }
 async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('projects-list', undefined, derivedAccountId);
-    const projectData = await getProjectData(derivedAccountId);
+    const { derivedAccountId, exit } = args;
+    let projectData;
+    try {
+        projectData = await getProjectData(derivedAccountId);
+    }
+    catch (e) {
+        logError(e);
+        return exit(EXIT_CODES.ERROR);
+    }
     if (projectData.length === 0) {
         uiLogger.error(commands.project.list.errors.noProjectsFound(derivedAccountId));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const projectListData = formatProjectsAsTableRows(projectData);
     const tableHeader = [
@@ -52,11 +52,12 @@ const builder = makeYargsBuilder(projectListBuilder, command, describe, {
     useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,
+    useEnvironmentOptions: true,
 });
 const projectListCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('project-list', handler),
     builder,
 };
 export default projectListCommand;

package/commands/project/listBuilds.d.ts

@@ -1,5 +1,5 @@
 import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs.js';
-type ProjectListBuildsArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
+export type ProjectListBuildsArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     project?: string;
     limit?: number;
 };

package/commands/project/listBuilds.js

@@ -5,9 +5,9 @@ import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/con
 import { getProjectDetailUrl } from '../../lib/projects/urls.js';
 import moment from 'moment';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
@@ -17,12 +17,6 @@ const describe = commands.project.listBuilds.describe;
 async function fetchAndDisplayBuilds(accountId, project, options) {
     const { data: { results, paging }, } = await fetchProjectBuilds(accountId, project.name, options);
     const currentDeploy = project.deployedBuildId;
-    if (options && options.after) {
-        uiLogger.log(commands.project.listBuilds.showingNextBuilds(results.length, project.name));
-    }
-    else {
-        uiLogger.log(commands.project.listBuilds.showingRecentBuilds(results.length, project.name, uiLink(commands.project.listBuilds.viewAllBuildsLink, getProjectDetailUrl(project.name, accountId))));
-    }
     if (results.length === 0) {
         uiLogger.log(commands.project.listBuilds.errors.noBuilds);
     }
@@ -46,6 +40,14 @@ async function fetchAndDisplayBuilds(accountId, project, options) {
         });
         renderTable(['Build ID', 'Status', 'Completed', 'Duration', 'Details'], builds);
     }
+    if (options && options.after) {
+        if (results.length > 0) {
+            uiLogger.log(commands.project.listBuilds.showingNextBuilds(results.length, project.name));
+        }
+    }
+    else {
+        uiLogger.log(commands.project.listBuilds.showingRecentBuilds(results.length, project.name, uiLink(commands.project.listBuilds.viewAllBuildsLink, getProjectDetailUrl(project.name, accountId))));
+    }
     if (paging && paging.next) {
         await promptUser({
             name: 'more',
@@ -58,8 +60,7 @@ async function fetchAndDisplayBuilds(accountId, project, options) {
     }
 }
 async function handler(args) {
-    const { project: projectFlagValue, limit, derivedAccountId } = args;
-    trackCommandUsage('project-list-builds', undefined, derivedAccountId);
+    const { project: projectFlagValue, limit, derivedAccountId, exit } = args;
     let projectName = projectFlagValue;
     if (!projectName) {
         const { projectConfig, projectDir } = await getProjectConfig();
@@ -68,7 +69,10 @@ async function handler(args) {
         }
         catch (error) {
             logError(error);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
+        }
+        if (!projectConfig) {
+            return exit(EXIT_CODES.ERROR);
         }
         projectName = projectConfig.name;
     }
@@ -87,7 +91,7 @@ async function handler(args) {
             }));
         }
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function projectListBuildsBuilder(yargs) {
     yargs.options({
@@ -114,7 +118,7 @@ const builder = makeYargsBuilder(projectListBuildsBuilder, command, describe, {
 const projectListBuildsCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('project-list-builds', handler),
     builder,
 };
 export default projectListBuildsCommand;

package/commands/project/logs.js

@@ -1,6 +1,4 @@
-import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
-import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { getHubSpotWebsiteOriginByAccountId } from '@hubspot/local-dev-lib/urls';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { uiLine } from '../../lib/ui/index.js';
 import { projectLogsPrompt } from '../../lib/prompts/projectsLogsPrompt.js';
@@ -8,11 +6,11 @@ import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { ProjectLogsManager } from '../../lib/projects/ProjectLogsManager.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { renderTable } from '../../ui/render.js';
 function getPrivateAppsUrl(accountId) {
-    const baseUrl = getHubSpotWebsiteOrigin(getConfigAccountEnvironment(accountId));
-    return `${baseUrl}/private-apps/${accountId}`;
+    return `${getHubSpotWebsiteOriginByAccountId(accountId)}/private-apps/${accountId}`;
 }
 function logPreamble() {
     if (ProjectLogsManager.isPublicFunction) {
@@ -51,8 +49,7 @@ function logPreamble() {
 const command = 'logs';
 const describe = commands.project.logs.describe;
 async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('project-logs', undefined, derivedAccountId);
+    const { derivedAccountId, exit } = args;
     try {
         await ProjectLogsManager.init(derivedAccountId);
         const { functionName } = await projectLogsPrompt({
@@ -68,9 +65,9 @@ async function handler(args) {
             accountId: derivedAccountId,
             projectName: ProjectLogsManager.projectName,
         });
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function projectLogsBuilder(yargs) {
     yargs.options({
@@ -113,7 +110,7 @@ const builder = makeYargsBuilder(projectLogsBuilder, command, describe, { useGlo
 const projectLogsCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('project-logs', handler),
     builder,
 };
 export default projectLogsCommand;