@hubspot/cli 8.2.0 → 8.2.1-experimental.0

package/commands/api.js

@@ -0,0 +1,161 @@
+import { http } from '@hubspot/local-dev-lib/http';
+import { getHubSpotApiOrigin } from '@hubspot/local-dev-lib/urls';
+import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
+import { logError, debugError, ApiErrorContext, } from '../lib/errorHandlers/index.js';
+import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
+import { commands } from '../lang/en.js';
+import { EXIT_CODES } from '../lib/enums/exitCodes.js';
+import { makeWrappedYargsHandler } from '../lib/yargs/makeWrappedYargsHandler.js';
+import { makeYargsBuilder } from '../lib/yargsUtils.js';
+import { uiLogger } from '../lib/ui/logger.js';
+const HTTP_METHODS = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'];
+const command = 'api <endpoint>';
+const describe = commands.api.describe;
+function parseRequestData(data) {
+    try {
+        return JSON.parse(data);
+    }
+    catch {
+        return undefined;
+    }
+}
+function resolveMethod(args) {
+    if (args.method) {
+        return args.method;
+    }
+    return args.data ? 'POST' : 'GET';
+}
+function normalizeEndpoint(endpoint) {
+    return endpoint.startsWith('/') ? endpoint.slice(1) : endpoint;
+}
+async function handler(args) {
+    const { endpoint, data, derivedAccountId, json: formatOutputAsJson, exit, addUsageMetadata, addJsonOutput, } = args;
+    const method = resolveMethod(args);
+    addUsageMetadata({ action: method });
+    let parsedData;
+    if (data) {
+        parsedData = parseRequestData(data);
+        if (parsedData === undefined) {
+            uiLogger.error(commands.api.errors.invalidJson);
+            return exit(EXIT_CODES.ERROR);
+        }
+    }
+    const normalizedEndpoint = normalizeEndpoint(endpoint);
+    const env = getConfigAccountEnvironment(derivedAccountId);
+    const baseUrl = getHubSpotApiOrigin(env);
+    const fullUrl = `${baseUrl}/${normalizedEndpoint}`;
+    if (!formatOutputAsJson) {
+        uiLogger.log(commands.api.requestLog(method, fullUrl));
+        if (parsedData) {
+            uiLogger.log(commands.api.requestBodyLog(JSON.stringify(parsedData)));
+        }
+        uiLogger.log('');
+    }
+    try {
+        const requestOptions = {
+            url: normalizedEndpoint,
+        };
+        if (parsedData) {
+            requestOptions.data = parsedData;
+            requestOptions.headers = { 'Content-Type': 'application/json' };
+        }
+        let response;
+        switch (method) {
+            case 'GET':
+                response = await http.get(derivedAccountId, requestOptions);
+                break;
+            case 'POST':
+                response = await http.post(derivedAccountId, requestOptions);
+                break;
+            case 'PUT':
+                response = await http.put(derivedAccountId, requestOptions);
+                break;
+            case 'PATCH':
+                response = await http.patch(derivedAccountId, requestOptions);
+                break;
+            case 'DELETE':
+                response = await http.delete(derivedAccountId, requestOptions);
+                break;
+        }
+        if (response !== undefined) {
+            const responseData = response.data;
+            addJsonOutput(responseData);
+            if (!formatOutputAsJson) {
+                uiLogger.log(commands.api.responseLog);
+                uiLogger.log(JSON.stringify(responseData, null, 2));
+            }
+        }
+    }
+    catch (error) {
+        const errorContext = new ApiErrorContext({
+            accountId: derivedAccountId,
+            request: `api ${method} ${endpoint}`,
+        });
+        if (!isHubSpotHttpError(error)) {
+            logError(error, errorContext);
+            return exit(EXIT_CODES.ERROR);
+        }
+        debugError(error, errorContext);
+        const errorData = error.data;
+        if (errorData) {
+            addJsonOutput(errorData);
+        }
+        if (!formatOutputAsJson) {
+            if (error.status && error.statusText) {
+                uiLogger.error(commands.api.errors.statusLine(error.status, error.statusText));
+            }
+            if (errorData) {
+                uiLogger.log(JSON.stringify(errorData, null, 2));
+            }
+            else {
+                uiLogger.error(error.message);
+            }
+        }
+        return exit(EXIT_CODES.ERROR);
+    }
+    return exit(EXIT_CODES.SUCCESS);
+}
+function apiBuilder(yargs) {
+    yargs.positional('endpoint', {
+        describe: commands.api.positionals.endpoint.describe,
+        type: 'string',
+    });
+    yargs.option('method', {
+        alias: 'X',
+        describe: commands.api.options.method.describe,
+        type: 'string',
+        choices: [...HTTP_METHODS, ...HTTP_METHODS.map(m => m.toLowerCase())],
+        coerce: (value) => value.toUpperCase(),
+    });
+    yargs.option('data', {
+        describe: commands.api.options.data.describe,
+        type: 'string',
+    });
+    yargs.example([
+        ['$0 api /crm/v3/objects/contacts', 'Fetch contacts using GET'],
+        [
+            '$0 api /crm/v3/objects/contacts -X POST --data \'{"properties":{"email":"test@example.com"}}\'',
+            'Create a contact',
+        ],
+        ['$0 api /crm/v3/objects/deals/123', 'Fetch a specific deal'],
+        [
+            '$0 api /crm/v3/objects/contacts -a my-sandbox',
+            'Fetch contacts from a specific account',
+        ],
+    ]);
+    return yargs;
+}
+const builder = makeYargsBuilder(apiBuilder, command, commands.api.verboseDescribe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+    useJSONOutputOptions: true,
+});
+const apiCommand = {
+    command,
+    describe,
+    builder,
+    handler: makeWrappedYargsHandler('api', handler),
+};
+export default apiCommand;

package/commands/app/logDetails.d.ts

@@ -0,0 +1,9 @@
+import { AccountArgs, CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs.js';
+export type AppLogDetailsArgs = CommonArgs & ConfigArgs & AccountArgs & {
+    logId: string;
+    app?: number;
+    type?: string;
+    json?: boolean;
+};
+declare const logDetailsCommand: YargsCommandModule<unknown, AppLogDetailsArgs>;
+export default logDetailsCommand;

package/commands/app/logDetails.js

@@ -0,0 +1,86 @@
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { commands } from '../../lang/en.js';
+import { selectAppPrompt } from '../../lib/prompts/selectAppPrompt.js';
+import { listPrompt } from '../../lib/prompts/promptUtils.js';
+import { getTypeChoices, handleLogDetailsRequest, SYSTEM_TYPE_CHOICES, toSystemType, } from '../../lib/app/logs.js';
+import { logError } from '../../lib/errorHandlers/index.js';
+const command = 'log-details <log-id>';
+const describe = commands.app.subcommands.logDetails.describe;
+const handler = async (options) => {
+    const { logId, app: appIdArg, type: typeArg, derivedAccountId, exit, addUsageMetadata, } = options;
+    addUsageMetadata({ type: typeArg });
+    let appId = appIdArg;
+    if (!appId) {
+        const selectedApp = await selectAppPrompt(derivedAccountId);
+        if (!selectedApp) {
+            return exit(EXIT_CODES.ERROR);
+        }
+        appId = selectedApp.id;
+    }
+    let rawType = typeArg;
+    if (!rawType) {
+        rawType = await listPrompt(commands.app.subcommands.logDetails.prompts.selectType, {
+            choices: getTypeChoices(),
+        });
+        if (!rawType) {
+            return exit(EXIT_CODES.ERROR);
+        }
+    }
+    const systemType = toSystemType(rawType);
+    try {
+        await handleLogDetailsRequest(derivedAccountId, appId, logId, systemType, options);
+        return exit(EXIT_CODES.SUCCESS);
+    }
+    catch (e) {
+        logError(e);
+        return exit(EXIT_CODES.ERROR);
+    }
+};
+function logDetailsBuilder(yargs) {
+    yargs
+        .positional('log-id', {
+        describe: commands.app.subcommands.logDetails.positionals.logId,
+        type: 'string',
+        demandOption: true,
+    })
+        .options({
+        app: {
+            describe: commands.app.subcommands.logDetails.options.appId,
+            type: 'number',
+        },
+        type: {
+            describe: commands.app.subcommands.logDetails.options.type,
+            type: 'string',
+            choices: SYSTEM_TYPE_CHOICES,
+        },
+        json: {
+            describe: commands.app.subcommands.logDetails.options.json,
+            type: 'boolean',
+        },
+    });
+    yargs.example([
+        [
+            '$0 app log-details abc-123-def --app=123456 --type=webhooks',
+            commands.app.subcommands.logDetails.examples.basic,
+        ],
+        [
+            '$0 app log-details abc-123-def --app=123456 --type=webhooks --json',
+            commands.app.subcommands.logDetails.examples.json,
+        ],
+    ]);
+    return yargs;
+}
+const builder = makeYargsBuilder(logDetailsBuilder, command, commands.app.subcommands.logDetails.verboseDescribe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+});
+const logDetailsCommand = {
+    command,
+    describe,
+    builder,
+    handler: makeWrappedYargsHandler('app-log-details', handler),
+};
+export default logDetailsCommand;

package/commands/app/logs.d.ts

@@ -0,0 +1,13 @@
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs.js';
+export type AppLogsArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
+    app?: number;
+    type?: string;
+    json?: boolean;
+    limit?: number;
+    since?: string;
+    tail?: boolean;
+    errorsOnly?: boolean;
+    compact?: boolean;
+};
+declare const logsCommand: YargsCommandModule<unknown, AppLogsArgs>;
+export default logsCommand;

package/commands/app/logs.js

@@ -0,0 +1,126 @@
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { commands } from '../../lang/en.js';
+import { selectAppPrompt } from '../../lib/prompts/selectAppPrompt.js';
+import { listPrompt } from '../../lib/prompts/promptUtils.js';
+import { getTypeChoices, handleLogsRequest, SYSTEM_TYPE_CHOICES, tailAppLogs, toSystemType, } from '../../lib/app/logs.js';
+import { logError } from '../../lib/errorHandlers/index.js';
+import { showMcpPromotionNudge } from '../../lib/mcp/promotion.js';
+const command = 'logs';
+const describe = commands.app.subcommands.logs.describe;
+const handler = async (options) => {
+    const { app: appIdArg, type, tail, derivedAccountId, exit, addUsageMetadata, } = options;
+    addUsageMetadata({
+        type,
+    });
+    let appId = appIdArg;
+    if (!appId) {
+        const selectedApp = await selectAppPrompt(derivedAccountId);
+        if (!selectedApp) {
+            return exit(EXIT_CODES.ERROR);
+        }
+        appId = selectedApp.id;
+    }
+    let rawType = type;
+    if (!rawType) {
+        rawType = await listPrompt(commands.app.subcommands.logs.prompts.selectType, {
+            choices: getTypeChoices(),
+        });
+        if (!rawType) {
+            return exit(EXIT_CODES.ERROR);
+        }
+    }
+    const systemType = toSystemType(rawType);
+    try {
+        if (tail) {
+            await tailAppLogs(derivedAccountId, appId, systemType, options);
+        }
+        else {
+            await handleLogsRequest(derivedAccountId, appId, systemType, options);
+            if (!options.json) {
+                await showMcpPromotionNudge(options._.join(' '));
+            }
+        }
+        return exit(EXIT_CODES.SUCCESS);
+    }
+    catch (e) {
+        logError(e);
+        return exit(EXIT_CODES.ERROR);
+    }
+};
+function logsBuilder(yargs) {
+    yargs
+        .options({
+        app: {
+            describe: commands.app.subcommands.logs.options.appId,
+            type: 'number',
+        },
+        type: {
+            describe: commands.app.subcommands.logs.options.type,
+            type: 'string',
+            choices: SYSTEM_TYPE_CHOICES,
+        },
+        json: {
+            describe: commands.app.subcommands.logs.options.json,
+            type: 'boolean',
+        },
+        limit: {
+            describe: commands.app.subcommands.logs.options.limit,
+            type: 'number',
+        },
+        since: {
+            describe: commands.app.subcommands.logs.options.since,
+            type: 'string',
+        },
+        tail: {
+            describe: commands.app.subcommands.logs.options.tail,
+            type: 'boolean',
+        },
+        'errors-only': {
+            describe: commands.app.subcommands.logs.options.errorsOnly,
+            type: 'boolean',
+        },
+        compact: {
+            describe: commands.app.subcommands.logs.options.compact,
+            type: 'boolean',
+        },
+    })
+        .conflicts('tail', ['limit', 'json']);
+    yargs.example([
+        [
+            '$0 app logs --app=123456 --type=webhooks',
+            commands.app.subcommands.logs.examples.basic,
+        ],
+        [
+            '$0 app logs --app=123456 --type=api-call --since=1h',
+            commands.app.subcommands.logs.examples.since,
+        ],
+        [
+            '$0 app logs --app=123456 --type=serverless-execution --tail',
+            commands.app.subcommands.logs.examples.tail,
+        ],
+        [
+            '$0 app logs --app=123456 --type=crm-extensibility-card --json',
+            commands.app.subcommands.logs.examples.json,
+        ],
+        [
+            '$0 app logs --app=123456 --type=webhooks --compact',
+            commands.app.subcommands.logs.examples.compact,
+        ],
+    ]);
+    return yargs;
+}
+const builder = makeYargsBuilder(logsBuilder, command, commands.app.subcommands.logs.verboseDescribe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const logsCommand = {
+    command,
+    describe,
+    builder,
+    handler: makeWrappedYargsHandler('app-logs', handler),
+};
+export default logsCommand;

package/commands/app/migrate.js

@@ -1,6 +1,7 @@
 import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
-import { PLATFORM_VERSIONS } from '@hubspot/local-dev-lib/constants/projects';
-import { trackCommandMetadataUsage, trackCommandUsage, } from '../../lib/usageTracking.js';
+import { PLATFORM_VERSIONS } from '@hubspot/project-parsing-lib/constants';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
+import { trackCommandMetadataUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
@@ -8,17 +9,16 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { migrateApp } from '../../lib/app/migrate.js';
 import { getIsInProject } from '../../lib/projects/config.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-const { v2025_2 } = PLATFORM_VERSIONS;
+const { v2025_2, v2026_03_BETA, v2026_03 } = PLATFORM_VERSIONS;
 const command = 'migrate';
 const describe = commands.project.migrateApp.describe;
 export function handlerGenerator(commandTrackingName) {
     return async function handler(args) {
-        const { derivedAccountId, platformVersion, unstable } = args;
-        await trackCommandUsage(commandTrackingName, {}, derivedAccountId);
+        const { derivedAccountId, platformVersion, unstable, exit } = args;
         const accountConfig = getConfigAccountById(derivedAccountId);
         if (!accountConfig) {
             uiLogger.error(commands.project.migrateApp.errors.noAccountConfig);
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         uiLogger.log('');
         uiLogger.log(commands.project.migrateApp.header);
@@ -26,10 +26,10 @@ export function handlerGenerator(commandTrackingName) {
         try {
             if (getIsInProject()) {
                 uiLogger.error(commands.project.migrateApp.errors.notAllowedWithinProject);
-                return process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
             args.platformVersion = unstable
-                ? PLATFORM_VERSIONS.unstable
+                ? PLATFORM_VERSIONS.UNSTABLE
                 : platformVersion;
             await migrateApp(derivedAccountId, args);
         }
@@ -44,10 +44,10 @@ export function handlerGenerator(commandTrackingName) {
                 logError(error, new ApiErrorContext({ accountId: derivedAccountId }));
             }
             await trackCommandMetadataUsage(commandTrackingName, { successful: false }, derivedAccountId);
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         await trackCommandMetadataUsage(commandTrackingName, { successful: true }, derivedAccountId);
-        return process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     };
 }
 const handler = handlerGenerator('app-migrate');
@@ -67,8 +67,8 @@ function appMigrateBuilder(yargs) {
         },
         'platform-version': {
             type: 'string',
-            choices: [v2025_2],
-            default: v2025_2,
+            choices: [v2025_2, v2026_03_BETA, v2026_03],
+            default: v2026_03,
         },
         unstable: {
             type: 'boolean',
@@ -90,7 +90,7 @@ const builder = makeYargsBuilder(appMigrateBuilder, command, commands.project.mi
 const migrateCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('app-migrate', handler),
     builder,
 };
 export default migrateCommand;

package/commands/app/secret/add.js

@@ -1,24 +1,23 @@
 import { addAppSecret } from '@hubspot/local-dev-lib/api/devSecrets';
 import { logError } from '../../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { secretValuePrompt, secretNamePrompt, } from '../../../lib/prompts/secretPrompt.js';
 import { selectAppPrompt } from '../../../lib/prompts/selectAppPrompt.js';
 import { commands } from '../../../lang/en.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { uiBetaTag } from '../../../lib/ui/index.js';
 const command = 'add [name]';
 const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.add.describe, false);
 async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('app-secret-add', {}, derivedAccountId);
+    const { derivedAccountId, exit } = args;
     try {
         const appSecretApp = await selectAppPrompt(derivedAccountId, args.app);
         if (!appSecretApp) {
             uiLogger.log('');
             uiLogger.log(commands.app.subcommands.secret.subcommands.add.errors.noApps);
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         let appSecretName = args.name;
         if (!appSecretName) {
@@ -32,9 +31,9 @@ async function handler(args) {
     }
     catch (err) {
         logError(err);
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function addAppSecretBuilder(yargs) {
     yargs.positional('name', {
@@ -57,7 +56,7 @@ const builder = makeYargsBuilder(addAppSecretBuilder, command, describe, {
 const addAppSecretCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('app-secret-add', handler),
     builder,
 };
 export default addAppSecretCommand;

package/commands/app/secret/delete.js

@@ -1,21 +1,20 @@
 import { deleteAppSecret, fetchAppSecrets, } from '@hubspot/local-dev-lib/api/devSecrets';
 import { logError } from '../../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { confirmPrompt, listPrompt } from '../../../lib/prompts/promptUtils.js';
 import { selectAppPrompt } from '../../../lib/prompts/selectAppPrompt.js';
 import { commands } from '../../../lang/en.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { uiBetaTag } from '../../../lib/ui/index.js';
 const command = 'delete [name]';
 const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.delete.describe, false);
 async function handler(args) {
-    const { derivedAccountId, force } = args;
-    trackCommandUsage('app-secret-delete', {}, derivedAccountId);
+    const { derivedAccountId, force, exit } = args;
     const appSecretApp = await selectAppPrompt(derivedAccountId, args.app);
     if (!appSecretApp) {
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     let appSecretToDelete = args.name;
     if (!appSecretToDelete) {
@@ -28,11 +27,11 @@ async function handler(args) {
         }
         catch (err) {
             logError(err);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         if (appSecrets.length === 0) {
             uiLogger.error(commands.app.subcommands.secret.subcommands.delete.errors.noSecrets);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         appSecretToDelete = await listPrompt(commands.app.subcommands.secret.subcommands.delete.selectSecret, { choices: appSecrets });
     }
@@ -42,7 +41,7 @@ async function handler(args) {
         }));
     if (!confirmDelete) {
         uiLogger.log(commands.app.subcommands.secret.subcommands.delete.deleteCanceled);
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     try {
         await deleteAppSecret(derivedAccountId, appSecretApp.id, appSecretToDelete);
@@ -51,9 +50,9 @@ async function handler(args) {
     }
     catch (err) {
         logError(err);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function deleteAppSecretBuilder(yargs) {
     yargs.positional('name', {
@@ -80,7 +79,7 @@ const builder = makeYargsBuilder(deleteAppSecretBuilder, command, describe, {
 const deleteAppSecretCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('app-secret-delete', handler),
     builder,
 };
 export default deleteAppSecretCommand;

package/commands/app/secret/list.js

@@ -1,8 +1,8 @@
 import { fetchAppSecrets } from '@hubspot/local-dev-lib/api/devSecrets';
 import { logError } from '../../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { commands } from '../../../lang/en.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { selectAppPrompt } from '../../../lib/prompts/selectAppPrompt.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
@@ -10,11 +10,10 @@ import { uiBetaTag } from '../../../lib/ui/index.js';
 const command = 'list';
 const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.list.describe, false);
 async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('app-secret-list', {}, derivedAccountId);
+    const { derivedAccountId, exit } = args;
     const appSecretApp = await selectAppPrompt(derivedAccountId, args.app);
     if (!appSecretApp) {
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     let appSecrets = [];
     try {
@@ -25,7 +24,7 @@ async function handler(args) {
     }
     catch (err) {
         logError(err);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (appSecrets.length === 0) {
         uiLogger.log('');
@@ -38,7 +37,7 @@ async function handler(args) {
             uiLogger.log(`- ${secret}`);
         });
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function listAppSecretBuilder(yargs) {
     yargs.option('app', {
@@ -57,7 +56,7 @@ const builder = makeYargsBuilder(listAppSecretBuilder, command, describe, {
 const listAppSecretCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('app-secret-list', handler),
     builder,
 };
 export default listAppSecretCommand;