@hubspot/cli 8.2.0 → 8.2.1-experimental.0

package/mcp-server/types.js

@@ -1,13 +1 @@
-export class Tool {
-    mcpServer;
-    constructor(mcpServer) {
-        this.mcpServer = mcpServer;
-    }
-    register() {
-        throw new Error('Must implement register');
-    }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    handler(input) {
-        throw new Error('Must implement handler');
-    }
-}
+export {};

package/mcp-server/utils/command.d.ts

@@ -1,8 +1,31 @@
 import { exec } from 'node:child_process';
+export interface Command {
+    executable: string;
+    args: string[];
+}
+export type FlagValue = string | number | boolean | string[];
+export interface Flag {
+    name: string;
+    value: FlagValue;
+}
+export declare class HubSpotCommand implements Command {
+    readonly executable = "hs";
+    private readonly subcommandArgs;
+    private readonly positionalArgs;
+    private readonly flags;
+    constructor(subcommand: string, flags?: Flag[]);
+    addArg(value: string): this;
+    addFlag(name: string, value: FlagValue): this;
+    get args(): string[];
+}
+export declare class NpxHubSpotCommand implements Command {
+    readonly executable = "npx";
+    readonly args: string[];
+    constructor(command: Command, cliPackage?: string);
+}
 export declare const execAsync: typeof exec.__promisify__;
-export declare function addFlag(command: string, flagName: string, value: string | number | boolean | string[]): string;
 export interface CommandResults {
     stderr: string;
     stdout: string;
 }
-export declare function runCommandInDir(directory: string, command: string): Promise<CommandResults>;
+export declare function runCommandInDir(directory: string, command: Command, onData?: (chunk: string, source: 'stdout' | 'stderr') => void): Promise<CommandResults>;

package/mcp-server/utils/command.js

@@ -1,33 +1,85 @@
 import path from 'path';
 import fs from 'fs';
 import util from 'util';
-import { exec } from 'node:child_process';
-export const execAsync = util.promisify(exec);
-export function addFlag(command, flagName, value) {
-    if (Array.isArray(value)) {
-        return `${command} --${flagName} ${value.map(item => `"${item}"`).join(' ')}`;
+import { exec, spawn } from 'node:child_process';
+export class HubSpotCommand {
+    executable = 'hs';
+    subcommandArgs;
+    positionalArgs;
+    flags;
+    constructor(subcommand, flags = []) {
+        this.subcommandArgs = subcommand.trim().split(/\s+/);
+        this.positionalArgs = [];
+        this.flags = [...flags];
+    }
+    addArg(value) {
+        this.positionalArgs.push(value);
+        return this;
+    }
+    addFlag(name, value) {
+        this.flags.push({ name, value });
+        return this;
+    }
+    get args() {
+        return [
+            ...this.subcommandArgs,
+            ...this.positionalArgs,
+            ...this.flags.flatMap(({ name, value }) => Array.isArray(value)
+                ? [`--${name}`, ...value.map(String)]
+                : [`--${name}`, String(value)]),
+        ];
     }
-    return `${command} --${flagName} "${value}"`;
 }
-export async function runCommandInDir(directory, command) {
+export class NpxHubSpotCommand {
+    executable = 'npx';
+    args;
+    constructor(command, cliPackage = '@hubspot/cli') {
+        this.args = ['-y', '-p', cliPackage, 'hs', ...command.args];
+    }
+}
+export const execAsync = util.promisify(exec);
+export async function runCommandInDir(directory, command, onData) {
     if (!fs.existsSync(directory)) {
         fs.mkdirSync(directory);
     }
     let finalCommand = command;
-    if (command.startsWith('hs ')) {
-        // Check if running in standalone mode
+    if (command instanceof HubSpotCommand) {
+        command.addFlag('disable-usage-tracking', 'true');
         if (process.env.HUBSPOT_MCP_STANDALONE === 'true') {
             const cliPackage = process.env.HUBSPOT_CLI_VERSION
                 ? `@hubspot/cli@${process.env.HUBSPOT_CLI_VERSION}`
                 : '@hubspot/cli';
-            finalCommand = command.replace(/^hs /, `npx -y -p ${cliPackage} hs `);
+            finalCommand = new NpxHubSpotCommand(command, cliPackage);
         }
-        finalCommand = addFlag(finalCommand, 'disable-usage-tracking', true);
     }
-    return execAsync(finalCommand, {
-        cwd: path.resolve(directory),
-        env: {
-            ...process.env,
-        },
+    const resolvedDir = path.resolve(directory);
+    return new Promise((resolve, reject) => {
+        const stdoutChunks = [];
+        const stderrChunks = [];
+        const child = spawn(finalCommand.executable, finalCommand.args, {
+            cwd: resolvedDir,
+            env: { ...process.env, INIT_CWD: resolvedDir },
+        });
+        child.stdout.on('data', (chunk) => {
+            const text = chunk.toString();
+            stdoutChunks.push(text);
+            onData?.(text, 'stdout');
+        });
+        child.stderr.on('data', (chunk) => {
+            const text = chunk.toString();
+            stderrChunks.push(text);
+            onData?.(text, 'stderr');
+        });
+        child.on('error', reject);
+        child.on('close', code => {
+            const stdout = stdoutChunks.join('');
+            const stderr = stderrChunks.join('');
+            if (code !== 0) {
+                reject(Object.assign(new Error(`Command failed: ${finalCommand.executable} ${finalCommand.args.join(' ')}\n${stderr}`), { code, stdout, stderr }));
+            }
+            else {
+                resolve({ stdout, stderr });
+            }
+        });
     });
 }

package/mcp-server/utils/config.js

@@ -3,8 +3,14 @@ export function setupHubSpotConfig(absoluteCurrentWorkingDirectory) {
     if (!absoluteCurrentWorkingDirectory) {
         return;
     }
+    process.env.INIT_CWD = absoluteCurrentWorkingDirectory;
     const configPath = getLocalConfigFilePathIfExists(absoluteCurrentWorkingDirectory);
     if (configPath) {
         process.env.HUBSPOT_CONFIG_PATH = configPath;
     }
+    else {
+        // Clear any value set by a previous tool call so this call doesn't
+        // inherit a stale config path from a different project.
+        delete process.env.HUBSPOT_CONFIG_PATH;
+    }
 }

package/mcp-server/utils/logger.d.ts

@@ -0,0 +1,13 @@
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+export declare class McpLogger {
+    private mcpServer;
+    private invocationStorage;
+    constructor(mcpServer: McpServer);
+    private log;
+    debug(logger: string, data: unknown): void;
+    info(logger: string, data: unknown): void;
+    warn(logger: string, data: unknown): void;
+    error(logger: string, data: unknown): void;
+    runWithBuffer<T>(fn: () => Promise<T>): Promise<T>;
+    flushLogsToFile(filenamePrefix: string): string | null;
+}

package/mcp-server/utils/logger.js

@@ -0,0 +1,59 @@
+import os from 'os';
+import path from 'path';
+import { AsyncLocalStorage } from 'node:async_hooks';
+import { LogBuffer } from '@hubspot/local-dev-lib/LogBuffer';
+import { MAX_LOG_FILES } from '../../lib/constants.js';
+const MCP_LOG_DIR = path.join(os.homedir(), '.hscli', 'logs', 'tools');
+export class McpLogger {
+    mcpServer;
+    invocationStorage = new AsyncLocalStorage();
+    constructor(mcpServer) {
+        this.mcpServer = mcpServer;
+    }
+    log(level, logger, data) {
+        try {
+            const buffer = this.invocationStorage.getStore();
+            if (buffer) {
+                const serialized = typeof data === 'string' ? data : JSON.stringify(data);
+                buffer.record(level, [logger, serialized]);
+            }
+            this.mcpServer.sendLoggingMessage({ level, logger, data });
+        }
+        catch (error) {
+            // sendLoggingMessage can throw if no transport is connected or the
+            // client doesn't support logging. Write to stderr so failures surface
+            // somewhere without corrupting the stdio JSON-RPC stream.
+            process.stderr.write(`[McpLogger] Failed to send log message: ${error}\n`);
+        }
+    }
+    debug(logger, data) {
+        this.log('debug', logger, data);
+    }
+    info(logger, data) {
+        this.log('info', logger, data);
+    }
+    warn(logger, data) {
+        this.log('warning', logger, data);
+    }
+    error(logger, data) {
+        this.log('error', logger, data);
+    }
+    // Runs fn in a fresh per-invocation log buffer context. All log calls made
+    // within fn (including nested async callbacks like progress chunks) record
+    // into this buffer rather than a shared one, so concurrent tool calls never
+    // intermix their logs.
+    runWithBuffer(fn) {
+        return this.invocationStorage.run(new LogBuffer(), fn);
+    }
+    flushLogsToFile(filenamePrefix) {
+        const buffer = this.invocationStorage.getStore();
+        if (!buffer) {
+            return null;
+        }
+        return buffer.writeToFile({
+            dir: MCP_LOG_DIR,
+            filenamePrefix,
+            maxFiles: MAX_LOG_FILES,
+        });
+    }
+}

package/mcp-server/utils/toolUsageTracking.js

@@ -1,24 +1,41 @@
-import { trackUsage } from '@hubspot/local-dev-lib/trackUsage';
-import { EventClass, getNodeVersionData, getPlatform, } from '../../lib/usageTracking.js';
-import { getConfig, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
-import { uiLogger } from '../../lib/ui/logger.js';
+import { EventClass, getExecutionEnvironmentMeta, } from '../../lib/usageTracking.js';
+import { getConfig } from '@hubspot/local-dev-lib/config';
+import { discoverAccountTargets } from '../../lib/accountTargetDiscovery.js';
+import { sendUsageEvent } from '../../lib/api/usageTracking.js';
 export async function trackToolUsage(toolName, meta) {
-    const config = getConfig();
+    let config;
+    try {
+        config = getConfig();
+    }
+    catch {
+        // No config file exists yet; skip tracking
+        return;
+    }
     if (config?.allowUsageTracking === false) {
         return;
     }
     const usageTrackingEvent = {
         action: 'cli-mcp-tool-invocation',
-        os: getPlatform(),
-        ...getNodeVersionData(),
         command: toolName,
         type: process.env.HUBSPOT_MCP_AI_AGENT,
+        ...getExecutionEnvironmentMeta(),
         ...meta,
     };
-    const accountId = getConfigDefaultAccountIfExists()?.accountId || undefined;
+    let accountId;
+    try {
+        const { recommended } = await discoverAccountTargets();
+        accountId = recommended?.accountId;
+    }
+    catch {
+        // Account discovery failed; continue without account ID
+    }
     try {
-        uiLogger.info('Tracking tool usage');
-        await trackUsage('cli-interaction', EventClass.INTERACTION, usageTrackingEvent, accountId);
+        await sendUsageEvent({
+            eventName: 'cli-interaction',
+            eventClass: EventClass.INTERACTION,
+            meta: usageTrackingEvent,
+            accountId,
+        });
     }
-    catch (error) { }
+    catch (_error) { }
 }

package/package.json

@@ -1,44 +1,50 @@
 {
     "name": "@hubspot/cli",
-    "version": "8.2.0",
+    "version": "8.2.1-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "type": "module",
+    "files": [
+        "**/*",
+        "!**/__tests__/**"
+    ],
     "dependencies": {
-        "@hubspot/local-dev-lib": "5.1.2",
-        "@hubspot/project-parsing-lib": "0.12.1",
+        "@hubspot/local-dev-lib": "5.10.2",
+        "@hubspot/project-parsing-lib": "0.4.0-experimental.0",
         "@hubspot/serverless-dev-runtime": "7.0.7",
-        "@hubspot/ui-extensions-dev-server": "2.0.0",
+        "@hubspot/ui-extensions-dev-server": "2.1.2",
         "@inquirer/prompts": "7.1.0",
-        "@modelcontextprotocol/sdk": "1.25.0",
+        "@modelcontextprotocol/sdk": "1.29.0",
         "archiver": "7.0.1",
         "chalk": "5.4.1",
         "chokidar": "3.6.0",
         "cli-cursor": "3.1.0",
         "cli-progress": "3.12.0",
-        "express": "4.21.2",
+        "express": "4.22.1",
         "findup-sync": "4.0.0",
         "fs-extra": "8.1.0",
         "ink": "6.6.0",
         "ink-spinner": "5.0.0",
         "ink-text-input": "6.0.0",
-        "js-yaml": "4.1.0",
-        "minimatch": "10.0.1",
+        "js-yaml": "4.1.1",
+        "minimatch": "10.2.5",
         "moment": "2.30.1",
         "open": "7.4.2",
         "p-queue": "8.1.0",
         "react": "19.2.3",
+        "semver": "7.6.3",
         "strip-ansi": "7.1.0",
         "table": "6.9.0",
         "tmp": "0.2.4",
         "update-notifier": "7.3.1",
-        "ws": "^8.18.2",
+        "ws": "8.20.0",
         "yargs": "17.7.2",
-        "yargs-parser": "21.1.1"
+        "yargs-parser": "21.1.1",
+        "zod": "^4.4.3"
     },
     "devDependencies": {
-        "@hubspot/npm-scripts": "0.2.2",
+        "@hubspot/npm-scripts": "^0.3.3",
         "@types/archiver": "^6.0.3",
         "@types/cli-progress": "^3.11.6",
         "@types/express": "^5.0.0",
@@ -55,7 +61,7 @@
         "@typescript-eslint/eslint-plugin": "^8.30.1",
         "@typescript-eslint/parser": "^8.11.0",
         "@vitest/coverage-v8": "^2.1.9",
-        "axios": "^1.12.2",
+        "axios": "1.18.1",
         "eslint": "^8.56.0",
         "eslint-plugin-import": "^2.31.0",
         "husky": "^4.3.8",
@@ -63,7 +69,6 @@
         "madge": "^8.0.0",
         "mock-stdin": "^1.0.0",
         "prettier": "^3.4.2",
-        "semver": "^7.6.3",
         "ts-node": "^10.9.2",
         "tsx": "^4.20.3",
         "typescript": "^5.6.2",
@@ -73,9 +78,10 @@
         "build": "tsx ./scripts/build.ts",
         "build-docker": "docker image build --tag hs-cli-image . && docker image prune -f",
         "circular-deps": "yarn madge --circular .",
-        "debug-mcp": "yarn build && npx @modelcontextprotocol/inspector node dist/mcp-server/server.js",
+        "debug-mcp": "yarn build && npx --yes @modelcontextprotocol/inspector node dist/mcp-server/server.js",
         "hs": "yarn build && node ./dist/bin/hs",
         "hs-debug": "yarn build && NODE_DEBUG=http* node --inspect-brk ./dist/bin/hs",
+        "hs-proxy": "yarn build && HTTPS_PROXY=http://localhost:8181 NODE_TLS_REJECT_UNAUTHORIZED=0 node ./dist/bin/hs",
         "lint": "echo 'Linting is disabled for Blazar'",
         "lint:local": "eslint . && prettier --list-different './**/*.{ts,tsx,js,json}'",
         "list-all-commands": "yarn tsx ./scripts/get-all-commands.ts",
@@ -118,6 +124,7 @@
         "registry": "https://registry.npmjs.org/"
     },
     "resolutions": {
-        "eslint-visitor-keys": "4.2.0"
+        "eslint-visitor-keys": "4.2.0",
+        "@eslint-community/eslint-utils": "4.9.0"
     }
 }

package/types/AccountTargets.d.ts

@@ -0,0 +1,37 @@
+import { AccountType, Environment } from '@hubspot/local-dev-lib/types/Accounts';
+import { ValueOf } from '@hubspot/local-dev-lib/types/Utils';
+import { ProjectConfig } from './Projects.js';
+export declare const ACCOUNT_TARGET_SELECTION_SOURCES: {
+    readonly EXPLICIT_ACCOUNT: "explicit-account";
+    readonly ENV_CONFIG: "env-config";
+    readonly PROFILE: "profile";
+    readonly LINKED_DIRECTORY: "linked-directory";
+    readonly GLOBAL_DEFAULT: "global-default";
+};
+export type AccountTargetSelectionSource = ValueOf<typeof ACCOUNT_TARGET_SELECTION_SOURCES>;
+export declare const ACCOUNT_TARGET_CATEGORIES: {
+    readonly RECOMMENDED_TESTING: "recommended-testing";
+    readonly PRODUCTION_WITH_CARE: "production-with-care";
+    readonly UNKNOWN: "unknown";
+};
+export type AccountTargetCategory = ValueOf<typeof ACCOUNT_TARGET_CATEGORIES>;
+export type AccountTargetCandidate = {
+    accountId: number;
+    accountName?: string;
+    accountType?: AccountType;
+    environment?: Environment;
+    source: AccountTargetSelectionSource;
+    category: AccountTargetCategory;
+    profileName?: string;
+};
+export type DiscoverAccountTargetsOptions = {
+    explicitAccount?: string | number;
+    useEnv?: boolean;
+    profileName?: string;
+    projectDir?: string | null;
+    projectConfig?: ProjectConfig | null;
+};
+export type DiscoverAccountTargetsResult = {
+    candidates: AccountTargetCandidate[];
+    recommended?: AccountTargetCandidate;
+};

package/types/AccountTargets.js

@@ -0,0 +1,12 @@
+export const ACCOUNT_TARGET_SELECTION_SOURCES = {
+    EXPLICIT_ACCOUNT: 'explicit-account',
+    ENV_CONFIG: 'env-config',
+    PROFILE: 'profile',
+    LINKED_DIRECTORY: 'linked-directory',
+    GLOBAL_DEFAULT: 'global-default',
+};
+export const ACCOUNT_TARGET_CATEGORIES = {
+    RECOMMENDED_TESTING: 'recommended-testing',
+    PRODUCTION_WITH_CARE: 'production-with-care',
+    UNKNOWN: 'unknown',
+};

package/types/Link.d.ts

@@ -0,0 +1,32 @@
+import { HubSpotConfigAccount } from '@hubspot/local-dev-lib/types/Accounts';
+import { HsSettingsFile } from '@hubspot/local-dev-lib/types/HsSettings';
+import { CommonArgs, ConfigArgs } from './Yargs.js';
+import { ArgumentsCamelCase } from 'yargs';
+export type LinkArgs = CommonArgs & ConfigArgs;
+export type LinkContext = {
+    globalAccountsList: HubSpotConfigAccount[];
+    globalDefaultAccount: HubSpotConfigAccount | undefined;
+    accountOverrideId: number | null;
+    preselectedAccountId?: number;
+};
+export declare const ACTION_RESULT_STATUS: {
+    readonly SUCCESS: "success";
+    readonly ERROR: "error";
+    readonly NOOP: "noop";
+};
+export type ActionResult = {
+    status: typeof ACTION_RESULT_STATUS.SUCCESS;
+    settings: HsSettingsFile;
+} | {
+    status: typeof ACTION_RESULT_STATUS.ERROR;
+    reason: string;
+} | {
+    status: typeof ACTION_RESULT_STATUS.NOOP;
+};
+export type ActionHandlerParams = {
+    state: HsSettingsFile;
+    context: LinkContext;
+    args: ArgumentsCamelCase<LinkArgs>;
+};
+export type ActionHandler = (params: ActionHandlerParams) => Promise<ActionResult>;
+export type ActionName = 'link' | 'unlink' | 'authenticate' | 'cancel';

package/types/Link.js

@@ -0,0 +1,5 @@
+export const ACTION_RESULT_STATUS = {
+    SUCCESS: 'success',
+    ERROR: 'error',
+    NOOP: 'noop',
+};

package/types/LocalDev.d.ts

@@ -5,7 +5,12 @@ import { ValueOf } from '@hubspot/local-dev-lib/types/Utils';
 import { Project } from '@hubspot/local-dev-lib/types/Project';
 import { ProjectConfig } from './Projects.js';
 import LocalDevState from '../lib/projects/localDev/LocalDevState.js';
-import { APP_INSTALLATION_STATES, LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES, LOCAL_DEV_SERVER_MESSAGE_TYPES } from '../lib/constants.js';
+import { LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES, LOCAL_DEV_SERVER_MESSAGE_TYPES } from '../lib/constants.js';
+import { ExitFunction } from './Yargs.js';
+import type { AppInstallationState } from './ProjectComponents.js';
+export type LocalDevActions = {
+    exit: ExitFunction;
+};
 export type LocalDevStateConstructorOptions = {
     targetProjectAccountId: number;
     targetTestingAccountId: number;
@@ -19,6 +24,7 @@ export type LocalDevStateConstructorOptions = {
     };
     initialProjectProfileData: HSProfileVariables;
     env: Environment;
+    actions: LocalDevActions;
 };
 export type LocalDevDeployWebsocketMessage = {
     type: typeof LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES.DEPLOY;
@@ -31,7 +37,7 @@ export type AppLocalDevData = {
     id: number;
     clientId: string;
     name: string;
-    installationState: ValueOf<typeof APP_INSTALLATION_STATES>;
+    installationState: AppInstallationState;
     scopeGroupIds: number[];
 };
 export type LocalDevServerMessage = ValueOf<typeof LOCAL_DEV_SERVER_MESSAGE_TYPES>;

package/types/PackageJson.d.ts

@@ -5,6 +5,7 @@ export interface PackageJson {
     name: string;
     version?: string;
     workspaces?: string[];
+    scripts?: Record<string, string>;
     dependencies?: Record<string, string>;
     devDependencies?: Record<string, string>;
 }

package/types/ProjectComponents.d.ts

@@ -1,8 +1,9 @@
 import type { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/translate';
-import { IR_COMPONENT_TYPES, APP_DISTRIBUTION_TYPES, APP_AUTH_TYPES } from '../lib/constants.js';
+import { IR_COMPONENT_TYPES, APP_DISTRIBUTION_TYPES, APP_AUTH_TYPES, APP_INSTALLATION_STATES } from '../lib/constants.js';
 import { ValueOf } from '@hubspot/local-dev-lib/types/Utils';
 type AppDistributionType = ValueOf<typeof APP_DISTRIBUTION_TYPES>;
 type AppAuthType = ValueOf<typeof APP_AUTH_TYPES>;
+export type AppInstallationState = ValueOf<typeof APP_INSTALLATION_STATES>;
 type AppConfig = {
     description: string;
     name: string;

package/types/Projects.d.ts

@@ -117,6 +117,25 @@ export type AppCardComponentConfig = {
     };
 };
 export type GenericComponentConfig = PublicAppComponentConfig | PrivateAppComponentConfig | AppCardComponentConfig;
+export type ProjectInfo = {
+    projectName: string;
+    platformVersion: string;
+    projectId: number;
+    deployedBuildId: number;
+    autoDeployEnabled: boolean;
+    projectUrl?: string;
+    app?: {
+        name: string;
+        id: number;
+        uid: string;
+        authType?: string;
+        distributionType?: string;
+    };
+    components: {
+        uid: string;
+        type: string;
+    }[];
+};
 export declare enum ComponentTypes {
     PrivateApp = "private-app",
     PublicApp = "public-app",
@@ -128,3 +147,8 @@ export type Component<T = GenericComponentConfig> = {
     runnable: boolean;
     path: string;
 };
+export type LocallyChangedComponents = {
+    added: string[];
+    updated: string[];
+    removed: string[];
+};

package/types/Prompts.d.ts

@@ -5,6 +5,7 @@ export type GenericPromptResponse = {
 type PromptType = 'confirm' | 'list' | 'checkbox' | 'input' | 'password' | 'number' | 'rawlist';
 export type PromptChoices<T = any> = Array<string | {
     name: string;
+    short?: string;
     value?: T;
     disabled?: string | boolean;
     checked?: boolean;

package/types/Yargs.d.ts

@@ -1,11 +1,25 @@
 import { Options, CommandModule, Argv } from 'yargs';
 import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
-export type CommonArgs = {
+import { EXIT_CODES } from '../lib/enums/exitCodes.js';
+import { ValueOf } from '@hubspot/local-dev-lib/types/Utils';
+import { UsageTrackingMeta } from '../lib/usageTracking.js';
+export type UsageTrackingMetaWithAccountId = UsageTrackingMeta & {
+    accountId?: number;
+};
+export type AddUsageMetadata = (meta: Omit<UsageTrackingMetaWithAccountId, 'successful'>) => void;
+export type UsageTrackingArgs = {
+    addUsageMetadata: AddUsageMetadata;
+    exit: ExitFunction;
+};
+type AccountMiddlewareArgs = {
     derivedAccountId: number;
     userProvidedAccount?: string;
+};
+type DebugArgs = {
     d: boolean;
     debug: boolean;
 };
+export type CommonArgs = AccountMiddlewareArgs & DebugArgs & UsageTrackingArgs;
 export type ConfigArgs = {
     c?: string;
     config?: string;
@@ -24,14 +38,17 @@ export type OverwriteArgs = Options & {
 export type StringArgType = Options & {
     type: 'string';
 };
-export type JSONOutputArgs = Options & {
+export type JSONOutputArgs<J extends Record<string, unknown> = Record<string, unknown>> = Options & {
     json?: boolean;
+    jsonSchema?: boolean;
     formatOutputAsJson?: boolean;
+    addJsonOutput: (data: Partial<J>) => void;
 };
 export type ProjectDevArgs = CommonArgs & ConfigArgs & EnvironmentArgs & {
     profile?: string;
     testingAccount?: string | number;
     projectAccount?: string | number;
+    port?: number;
 };
 export type TestingArgs = {
     qa?: boolean;
@@ -44,3 +61,6 @@ export interface YargsCommandModule<T, U> extends CommandModule<T, U> {
     builder: (yargs: Argv) => Promise<Argv<U>>;
 }
 export type YargsCommandModuleBucket = YargsCommandModule<unknown, object>;
+export type ExitCode = ValueOf<typeof EXIT_CODES>;
+export type ExitFunction = (code: ExitCode) => Promise<never>;
+export {};

package/ui/components/ActionSection.d.ts

@@ -7,6 +7,6 @@ export type ActionSectionProps = {
     errorMessage?: string;
     children?: React.ReactNode;
 };
-export declare function ActionSection({ status, statusText, errorMessage, children, }: ActionSectionProps): import("react/jsx-runtime").JSX.Element | null;
+export declare function ActionSection({ status, statusText, errorMessage, children, }: ActionSectionProps): import("react").JSX.Element | null;
 export declare function getActionSection(props: ActionSectionProps): React.ReactNode;
 export {};

package/ui/components/InputField.d.ts

@@ -6,5 +6,5 @@ export type InputFieldProps = {
     onChange: (value: string) => void;
     onSubmit: () => void;
 };
-export declare function InputField({ flag, prompt, value, isEditing, onChange, onSubmit, }: InputFieldProps): import("react/jsx-runtime").JSX.Element;
+export declare function InputField({ flag, prompt, value, isEditing, onChange, onSubmit, }: InputFieldProps): import("react").JSX.Element;
 export declare function getInputField(props: InputFieldProps): React.ReactNode;

package/ui/components/SelectInput.d.ts

@@ -7,5 +7,5 @@ export type SelectInputProps = {
     items: SelectInputItem[];
     onSelect: (item: SelectInputItem) => void;
 };
-export declare function SelectInput({ items, onSelect }: SelectInputProps): import("react/jsx-runtime").JSX.Element;
+export declare function SelectInput({ items, onSelect }: SelectInputProps): import("react").JSX.Element;
 export declare function getSelectInput(props: SelectInputProps): React.ReactNode;