@rage-against-the-pixel/unity-cli 1.8.3 → 3.0.0

package/dist/cli.js

@@ -53,16 +53,93 @@ const child_process_1 = require("child_process");
 const android_sdk_1 = require("./android-sdk");
 const license_client_1 = require("./license-client");
 const utilities_1 = require("./utilities");
+const upm_cli_1 = require("./upm-cli");
 const pkgPath = path.join(__dirname, '..', 'package.json');
 const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
 (0, update_notifier_1.default)({ pkg }).notify();
 const program = new commander_1.Command();
 program.name('unity-cli')
-    .description('A command line utility for the Unity Game Engine.')
+    .description('A powerful all-in-one command line utility for the Unity Game Engine.')
     .version(pkg.version);
+program.command('install-all-tools')
+    .description('Install the Unity Hub and the Unity Package Manager cli (pack/sign). Runs hub-install and upm-install in parallel.')
+    .option('--verbose', 'Enable verbose logging.')
+    .option('--auto-update', 'If any tools are installed, they\'re automatically updated to the latest versions. Cannot be used with --hub-version or --upm-version.')
+    .option('--hub-version <version>', 'Specify to install a specific version of Unity Hub. Cannot be used with --auto-update.')
+    .option('--upm-version <version>', 'Specify to install a specific version of the Unity Package Manager cli. Cannot be used with --auto-update.')
+    .option('--json', 'Print hub path, UPM CLI version, and resolved UPM CLI path as JSON.')
+    .action(async (options) => {
+    if (options.verbose) {
+        logging_1.Logger.instance.logLevel = logging_1.LogLevel.DEBUG;
+    }
+    logging_1.Logger.instance.debugOptions(options);
+    if (options.autoUpdate === true && options.hubVersion) {
+        logging_1.Logger.instance.error('Cannot use --auto-update with --hub-version.');
+        process.exit(1);
+    }
+    if (options.autoUpdate === true && options.upmVersion) {
+        logging_1.Logger.instance.error('Cannot use --auto-update with --upm-version.');
+        process.exit(1);
+    }
+    try {
+        const unityHub = new unity_hub_1.UnityHub();
+        const upm = new upm_cli_1.UpmCli();
+        let upmRequestedVersion = options.upmVersion?.toString()?.trim();
+        if (options.autoUpdate === true) {
+            const currentVersion = upm.GetInstalledReleaseTag();
+            const latestVersion = await upm.GetLatestReleaseTag();
+            if (currentVersion && !upm.IsUpdateAvailable(latestVersion)) {
+                logging_1.Logger.instance.info(`Upm cli is already up to date (${currentVersion}).`);
+                upmRequestedVersion = currentVersion;
+            }
+            else {
+                if (currentVersion) {
+                    logging_1.Logger.instance.info(`Updating upm cli ${currentVersion} -> ${latestVersion}...`);
+                }
+                upmRequestedVersion = latestVersion;
+            }
+        }
+        const [hubPath, upmVer] = await Promise.all([
+            unityHub.Install(options.autoUpdate === true, options.hubVersion),
+            upm.Install({
+                version: upmRequestedVersion,
+                skipIfInstalled: true
+            }),
+        ]);
+        logging_1.Logger.instance.CI_setEnvironmentVariable('UNITY_HUB_PATH', hubPath);
+        let upmCliPath;
+        try {
+            await upm.Version(upmVer);
+            upmCliPath = upm.executable;
+        }
+        catch (verifyError) {
+            logging_1.Logger.instance.warn(`Upm cli version check failed after install: ${verifyError}`);
+            if (process.env.CI === 'true') {
+                logging_1.Logger.instance.error('Failing in CI because the installed UPM CLI did not match the expected release.');
+                process.exit(1);
+            }
+            upmCliPath = upm.ResolveManagedPrimaryPath();
+        }
+        if (options.json) {
+            process.stdout.write(`\n${JSON.stringify({
+                UNITY_HUB_PATH: hubPath,
+                UPM_VERSION: upmVer,
+                UPM_CLI_PATH: upmCliPath,
+            })}\n`);
+        }
+        else {
+            process.stdout.write(`Unity Hub: ${hubPath}\nUpm cli: ${upmVer}\n${upmCliPath ?? ''}\n`);
+        }
+        process.exit(0);
+    }
+    catch (error) {
+        logging_1.Logger.instance.error(`${error}`);
+        process.exit(1);
+    }
+});
 program.commandsGroup('Auth:');
 program.command('license-version')
-    .description('Print the version of the Unity License Client.')
+    .description('Print the Unity License Client version.')
     .action(async () => {
     const client = new license_client_1.LicensingClient();
     await client.Version();
@@ -81,7 +158,7 @@ program.command('activate-license')
     if (options.verbose) {
         logging_1.Logger.instance.logLevel = logging_1.LogLevel.DEBUG;
     }
-    logging_1.Logger.instance.debug(JSON.stringify(options));
+    logging_1.Logger.instance.debugOptions(options);
     const client = new license_client_1.LicensingClient();
     const licenseStr = options.license?.toString()?.trim();
     if (!licenseStr || licenseStr.length === 0) {
@@ -103,6 +180,10 @@ program.command('activate-license')
         if (licenseType === license_client_1.LicenseType.professional && !options.serial) {
             options.serial = await (0, utilities_1.PromptForSecretInput)('Serial: ');
         }
+        // Mask credentials in CI environments before any potential logging
+        logging_1.Logger.instance.maskCredential(options.email);
+        logging_1.Logger.instance.maskCredential(options.password);
+        logging_1.Logger.instance.maskCredential(options.serial);
     }
     const token = await client.Activate({
         licenseType,
@@ -119,13 +200,13 @@ program.command('activate-license')
 program.command('return-license')
     .description('Return a Unity license.')
     .option('-l, --license <license>', 'License type (personal, professional, floating)')
-    .option('-t, --token <token>', 'Token received when acquiring a floating license lease. Required when returning a floating license.')
+    .option('-t, --token <token>', 'Floating license token. Required when returning a floating license.')
     .option('--verbose', 'Enable verbose logging.')
     .action(async (options) => {
     if (options.verbose) {
         logging_1.Logger.instance.logLevel = logging_1.LogLevel.DEBUG;
     }
-    logging_1.Logger.instance.debug(JSON.stringify(options));
+    logging_1.Logger.instance.debugOptions(options);
     const client = new license_client_1.LicensingClient();
     const licenseStr = options.license?.toString()?.trim();
     if (!licenseStr || licenseStr.length === 0) {
@@ -146,12 +227,14 @@ program.command('return-license')
             logging_1.Logger.instance.error('Token is required when returning a floating license. Use -t or --token to specify it.');
             process.exit(1);
         }
+        // Mask token in CI environments before any potential logging
+        logging_1.Logger.instance.maskCredential(token);
     }
     await client.Deactivate(licenseType, token);
     process.exit(0);
 });
 program.command('license-context')
-    .description('Display the context information of the Unity Licensing Client.')
+    .description('Print the current license context information.')
     .action(async () => {
     const client = new license_client_1.LicensingClient();
     await client.Context();
@@ -164,14 +247,14 @@ program.command('licensing-client-logs')
     process.exit(0);
 });
 program.command('licensing-audit-logs')
-    .description('Prints the path to the Unity Licensing Client audit log file.')
+    .description('Prints the path to the Unity Licensing Client audit log.')
     .action(async () => {
     process.stdout.write(`${license_client_1.LicensingClient.ClientAuditLogPath()}\n`);
     process.exit(0);
 });
 program.commandsGroup('Unity Hub:');
 program.command('hub-version')
-    .description('Print the version of the Unity Hub.')
+    .description('Print the Unity Hub version.')
     .action(async () => {
     const unityHub = new unity_hub_1.UnityHub();
     try {
@@ -212,7 +295,7 @@ program.command('package-manager-logs')
     process.exit(0);
 });
 program.command('hub-install')
-    .description('Install the Unity Hub.')
+    .description('Install or update the Unity Hub.')
     .option('--verbose', 'Enable verbose logging.')
     .option('--auto-update', 'Automatically updates the Unity Hub if it is already installed. Cannot be used with --hub-version.')
     .option('--hub-version <version>', 'Specify to install a specific version of Unity Hub. Cannot be used with --auto-update.')
@@ -221,7 +304,7 @@ program.command('hub-install')
     if (options.verbose) {
         logging_1.Logger.instance.logLevel = logging_1.LogLevel.DEBUG;
     }
-    logging_1.Logger.instance.debug(JSON.stringify(options));
+    logging_1.Logger.instance.debugOptions(options);
     if (options.autoUpdate === true && options.hubVersion) {
         logging_1.Logger.instance.error('Cannot use --auto-update with --hub-version.');
         process.exit(1);
@@ -247,7 +330,7 @@ program.command('hub')
     if (options.verbose) {
         logging_1.Logger.instance.logLevel = logging_1.LogLevel.DEBUG;
     }
-    logging_1.Logger.instance.debug(JSON.stringify({ args, options }));
+    logging_1.Logger.instance.debugOptions({ args, options });
     const unityHub = new unity_hub_1.UnityHub();
     const output = await unityHub.Exec(args, { silent: false, showCommand: logging_1.Logger.instance.logLevel === logging_1.LogLevel.DEBUG });
     if (options.json) {
@@ -256,7 +339,7 @@ program.command('hub')
     process.exit(0);
 });
 program.command('setup-unity')
-    .description('Sets up the environment for the specified project and finds or installs the Unity Editor version for it.')
+    .description('Find or install the Unity Editor for a project or specific version.')
     .option('-p, --unity-project <unityProject>', 'The path to a Unity project or "none" to skip project detection.')
     .option('-u, --unity-version <unityVersion>', 'The Unity version to get (e.g. 2020.3.1f1, 2021.x, 2022.1.*, 6000). If specified, it will override the version read from the project.')
     .option('-c, --changeset <changeset>', 'The Unity changeset to get (e.g. 1234567890ab).')
@@ -270,7 +353,7 @@ program.command('setup-unity')
     if (options.verbose) {
         logging_1.Logger.instance.logLevel = logging_1.LogLevel.DEBUG;
     }
-    logging_1.Logger.instance.debug(JSON.stringify(options));
+    logging_1.Logger.instance.debugOptions(options);
     let unityProject;
     if (options.unityProject) {
         unityProject = await unity_project_1.UnityProject.GetProject(options.unityProject);
@@ -336,7 +419,7 @@ program.command('setup-unity')
     process.exit(0);
 });
 program.command('uninstall-unity')
-    .description('Uninstall the specified Unity Editor version.')
+    .description('Uninstall a Unity Editor version.')
     .option('-e, --unity-editor <unityEditor>', 'The path to the Unity Editor executable. If unspecified, -u, --unity-version or the UNITY_EDITOR_PATH environment variable must be set.')
     .option('-u, --unity-version <unityVersion>', 'The Unity version to get (e.g. 2020.3.1f1, 2021.x, 2022.1.*, 6000). If unspecified, then --unity-editor must be specified.')
     .option('-c, --changeset <changeset>', 'The Unity changeset to get (e.g. 1234567890ab).')
@@ -346,7 +429,7 @@ program.command('uninstall-unity')
     if (options.verbose) {
         logging_1.Logger.instance.logLevel = logging_1.LogLevel.DEBUG;
     }
-    logging_1.Logger.instance.debug(JSON.stringify(options));
+    logging_1.Logger.instance.debugOptions(options);
     let unityEditor;
     const unityVersionStr = options.unityVersion?.toString()?.trim();
     if (unityVersionStr) {
@@ -384,11 +467,11 @@ program.command('uninstall-unity')
 });
 program.commandsGroup('Unity Editor:');
 program.command('run')
-    .description('Run command line args directly to the Unity Editor.')
+    .description('Run Unity Editor command line arguments (passes args directly to the editor).')
     .option('--unity-editor <unityEditor>', 'The path to the Unity Editor executable. If unspecified, --unity-project or the UNITY_EDITOR_PATH environment variable must be set.')
     .option('--unity-project <unityProject>', 'The path to a Unity project. If unspecified, the UNITY_PROJECT_PATH environment variable will be used, otherwise no project will be specified.')
     .option('--log-name <logName>', 'The name of the log file.')
-    .option('--log-level <logLevel>', 'Set the logging level (debug, info, minimal, warning, error). Default is info.')
+    .option('--log-level <logLevel>', 'Override the logger verbosity (debug, info, minimal, warning, error). Defaults to info.')
     .option('--verbose', 'Enable verbose logging. Deprecated, use --log-level instead.')
     .allowUnknownOption(true)
     .argument('<args...>', 'Arguments to pass to the Unity Editor executable.')
@@ -436,7 +519,7 @@ program.command('run')
     else if (requestedLogLevel) {
         logging_1.Logger.instance.logLevel = requestedLogLevel;
     }
-    logging_1.Logger.instance.debug(JSON.stringify({ options, args }));
+    logging_1.Logger.instance.debugOptions({ options, args });
     let unityEditor;
     const editorPath = options.unityEditor?.toString()?.trim() || process.env.UNITY_EDITOR_PATH || undefined;
     if (editorPath && editorPath.length > 0) {
@@ -487,19 +570,20 @@ program.command('run')
     process.exit(0);
 });
 program.command('list-project-templates')
-    .description('List all available project templates for the given Unity editor.')
+    .description('List available Unity project templates for an editor.')
     .option('-u, --unity-version <unityVersion>', 'The Unity version to get (e.g. 2020.3.1f1, 2021.x, 2022.1.*, 6000). If unspecified, then --unity-editor must be specified.')
-    .option('-e, --unity-editor <unityEditor>', 'The path to the Unity Editor executable. If unspecified, the UNITY_EDITOR_PATH environment variable must be set.')
+    .option('-e, --unity-editor <unityEditor>', 'The path to the Unity Editor executable. If unspecified, -u, --unity-version or the UNITY_EDITOR_PATH environment variable must be set.')
     .option('--verbose', 'Enable verbose logging.')
     .option('--json', 'Prints the last line of output as JSON string.')
     .action(async (options) => {
     if (options.verbose) {
         logging_1.Logger.instance.logLevel = logging_1.LogLevel.DEBUG;
     }
-    logging_1.Logger.instance.debug(JSON.stringify(options));
+    logging_1.Logger.instance.debugOptions(options);
     const unityVersionStr = options.unityVersion?.toString()?.trim();
-    if (!unityVersionStr && !options.unityEditor) {
-        logging_1.Logger.instance.error('You must specify a Unity version or editor path with -u, --unity-version, -e, --unity-editor.');
+    const editorFromEnv = process.env.UNITY_EDITOR_PATH?.trim();
+    if (!unityVersionStr && !options.unityEditor?.toString()?.trim() && !editorFromEnv) {
+        logging_1.Logger.instance.error('You must specify a Unity version or editor path with -u, --unity-version, -e, --unity-editor, or set UNITY_EDITOR_PATH.');
         process.exit(1);
     }
     let unityEditor;
@@ -508,7 +592,7 @@ program.command('list-project-templates')
         unityEditor = await new unity_hub_1.UnityHub().GetEditor(unityVersion);
     }
     else {
-        const editorPath = options.unityEditor?.toString()?.trim() || process.env.UNITY_EDITOR_PATH;
+        const editorPath = options.unityEditor?.toString()?.trim() || editorFromEnv;
         if (!editorPath || editorPath.length === 0) {
             throw new Error('The Unity Editor path was not specified. Use -e or --unity-editor to specify it, or set the UNITY_EDITOR_PATH environment variable.');
         }
@@ -541,10 +625,11 @@ program.command('create-project')
     if (options.verbose) {
         logging_1.Logger.instance.logLevel = logging_1.LogLevel.DEBUG;
     }
-    logging_1.Logger.instance.debug(JSON.stringify(options));
+    logging_1.Logger.instance.debugOptions(options);
     const unityVersionStr = options.unityVersion?.toString()?.trim();
-    if (!unityVersionStr && !options.unityEditor) {
-        logging_1.Logger.instance.error('You must specify a Unity version or editor path with -u, --unity-version, -e, --unity-editor.');
+    const editorFromEnv = process.env.UNITY_EDITOR_PATH?.trim();
+    if (!unityVersionStr && !options.unityEditor?.toString()?.trim() && !editorFromEnv) {
+        logging_1.Logger.instance.error('You must specify a Unity version or editor path with -u, --unity-version, -e, --unity-editor, or set UNITY_EDITOR_PATH.');
         process.exit(1);
     }
     let unityEditor;
@@ -553,7 +638,7 @@ program.command('create-project')
         unityEditor = await new unity_hub_1.UnityHub().GetEditor(unityVersion);
     }
     else {
-        const editorPath = options.unityEditor?.toString()?.trim() || process.env.UNITY_EDITOR_PATH;
+        const editorPath = options.unityEditor?.toString()?.trim() || editorFromEnv;
         if (!editorPath || editorPath.length === 0) {
             logging_1.Logger.instance.error('The Unity Editor path was not specified. Use -e or --unity-editor to specify it, or set the UNITY_EDITOR_PATH environment variable.');
             process.exit(1);
@@ -597,8 +682,10 @@ program.command('open-project')
     if (options.verbose) {
         logging_1.Logger.instance.logLevel = logging_1.LogLevel.DEBUG;
     }
-    logging_1.Logger.instance.debug(JSON.stringify(options));
-    const projectPath = options.unityProject?.toString()?.trim() || process.env.UNITY_PROJECT_PATH || undefined;
+    logging_1.Logger.instance.debugOptions(options);
+    const projectPath = options.unityProject?.toString()?.trim() ||
+        process.env.UNITY_PROJECT_PATH ||
+        undefined;
     const unityProject = await unity_project_1.UnityProject.GetProject(projectPath);
     if (!unityProject) {
         logging_1.Logger.instance.error(`The specified path is not a valid Unity project: ${projectPath}`);
@@ -638,19 +725,155 @@ program.command('editor-logs')
     process.exit(0);
 });
 program.commandsGroup("Unity Package Manager:");
+program.command('upm-install')
+    .description('Download and install the Unity Package Manager cli (pack/sign).')
+    .option('--verbose', 'Enable verbose logging.')
+    .option('--auto-update', 'Automatically updates the upm cli if it is already installed and a newer release is available. Cannot be used with --version.')
+    .option('--version <version>', 'Specify to install a specific version of the Unity Package Manager cli. Cannot be used with --auto-update.')
+    .option('--json', 'Print version and managed paths as JSON.')
+    .action(async (options) => {
+    if (options.verbose) {
+        logging_1.Logger.instance.logLevel = logging_1.LogLevel.DEBUG;
+    }
+    logging_1.Logger.instance.debugOptions(options);
+    try {
+        if (options.autoUpdate === true && options.version) {
+            logging_1.Logger.instance.error('Cannot use --auto-update with --version.');
+            process.exit(1);
+        }
+        const upm = new upm_cli_1.UpmCli();
+        let requestedVersion = options.version?.toString()?.trim();
+        if (options.autoUpdate === true) {
+            const currentVersion = upm.GetInstalledReleaseTag();
+            const latestVersion = await upm.GetLatestReleaseTag();
+            if (currentVersion && !upm.IsUpdateAvailable(latestVersion)) {
+                logging_1.Logger.instance.info(`Upm cli is already up to date (${currentVersion}).`);
+                requestedVersion = currentVersion;
+            }
+            else {
+                if (currentVersion) {
+                    logging_1.Logger.instance.info(`Updating upm cli ${currentVersion} -> ${latestVersion}...`);
+                }
+                requestedVersion = latestVersion;
+            }
+        }
+        const ver = await upm.Install({
+            version: requestedVersion,
+            skipIfInstalled: true
+        });
+        await upm.Version(ver);
+        const exe = upm.executable;
+        if (options.json) {
+            process.stdout.write(`\n${JSON.stringify({
+                UPM_VERSION: ver,
+                UPM_CLI_PATH: exe,
+                UPM_MANAGED_ROOT: upm.managedRoot,
+            })}\n`);
+        }
+        else {
+            process.stdout.write(`Upm cli ${ver} installed.\n`);
+            process.stdout.write(`${exe}\n`);
+        }
+        process.exit(0);
+    }
+    catch (error) {
+        logging_1.Logger.instance.error(`${error}`);
+        process.exit(1);
+    }
+});
+program.command('upm-version')
+    .description('Print the Unity Package Manager cli version.')
+    .action(async () => {
+    try {
+        const upmCli = new upm_cli_1.UpmCli();
+        const version = await upmCli.Version();
+        process.stdout.write(`v${version.version}\n`);
+        process.exit(0);
+    }
+    catch (error) {
+        logging_1.Logger.instance.error(`${error}`);
+        process.exit(1);
+    }
+});
+program.command('upm-pack')
+    .description('Sign and pack a Unity package.')
+    .option('--source <path>', 'An absolute or relative path to the root folder of the custom package to pack. This is the folder that contains the package manifest file (package.json). (optional; defaults to the current working directory).')
+    .option('--destination <path>', 'The output path for the signed tarball. If you specify a folder that doesn\'t exist, it will be created for you. Note: If you omit this parameter, the tarball will be placed in the current working directory.')
+    .option('--verbose', 'Enable verbose logging.')
+    .action(async (options) => {
+    if (options.verbose) {
+        logging_1.Logger.instance.logLevel = logging_1.LogLevel.DEBUG;
+    }
+    logging_1.Logger.instance.debugOptions({ options });
+    try {
+        const upm = new upm_cli_1.UpmCli();
+        await upm.PromptInstallOrUpdateWhenInteractive();
+        let serviceAccountKeyId = process.env.UPM_SERVICE_ACCOUNT_KEY_ID?.trim();
+        if (!serviceAccountKeyId) {
+            serviceAccountKeyId = (await (0, utilities_1.PromptForSecretInput)('UPM_SERVICE_ACCOUNT_KEY_ID: ')).trim();
+        }
+        if (!serviceAccountKeyId) {
+            logging_1.Logger.instance.error('UPM_SERVICE_ACCOUNT_KEY_ID is required. Set the environment variable or enter a value when prompted.');
+            process.exit(1);
+        }
+        let serviceAccountKeySecret = process.env.UPM_SERVICE_ACCOUNT_KEY_SECRET?.trim();
+        if (!serviceAccountKeySecret) {
+            serviceAccountKeySecret = (await (0, utilities_1.PromptForSecretInput)('UPM_SERVICE_ACCOUNT_KEY_SECRET: ')).trim();
+        }
+        if (!serviceAccountKeySecret) {
+            logging_1.Logger.instance.error('UPM_SERVICE_ACCOUNT_KEY_SECRET is required. Set the environment variable or enter a value when prompted.');
+            process.exit(1);
+        }
+        process.env.UPM_SERVICE_ACCOUNT_KEY_ID = serviceAccountKeyId;
+        logging_1.Logger.instance.maskCredential(serviceAccountKeyId);
+        process.env.UPM_SERVICE_ACCOUNT_KEY_SECRET = serviceAccountKeySecret;
+        logging_1.Logger.instance.maskCredential(serviceAccountKeySecret);
+        let orgId = process.env.UNITY_ORGANIZATION_ID?.trim() || process.env.UNITY_ORG_ID?.trim();
+        const dest = options.destination?.toString()?.trim();
+        if (!orgId) {
+            orgId = (await (0, utilities_1.PromptForSecretInput)('UNITY_ORGANIZATION_ID: ')).trim();
+        }
+        if (!orgId) {
+            logging_1.Logger.instance.error('Organization ID is required. Set UNITY_ORGANIZATION_ID or UNITY_ORG_ID, or enter a value when prompted.');
+            process.exit(1);
+        }
+        logging_1.Logger.instance.maskCredential(orgId);
+        const redactLiterals = [orgId, serviceAccountKeyId, serviceAccountKeySecret].filter((s) => typeof s === 'string' && s.trim().length > 0);
+        const packOptions = {
+            organizationId: orgId,
+        };
+        if (dest) {
+            packOptions.destination = dest;
+        }
+        const sourceArg = options.source?.toString()?.trim();
+        packOptions.packageDirectory =
+            sourceArg && sourceArg.length > 0 ? path.resolve(sourceArg) : process.cwd();
+        await upm.Pack(packOptions, {
+            silent: false,
+            showCommand: logging_1.Logger.instance.logLevel === logging_1.LogLevel.DEBUG,
+            redactLiterals,
+        });
+        process.exit(0);
+    }
+    catch (error) {
+        logging_1.Logger.instance.error(`${error}`);
+        process.exit(1);
+    }
+});
 program.command('sign-package')
-    .description('Sign a Unity package.')
-    .option('--package <package>', 'Required. The fully qualified path to the folder that contains the package.json file for the package you want to sign. Note: Don’t include package.json in this parameter value.')
+    .description('[Deprecated] Sign a Unity package using Unity Editor 6000.3+ batch mode (-upmPack). Use unity-cli upm-pack with organization and service account credentials for new workflows.')
+    .option('--package <package>', 'Required. The fully qualified path to the folder that contains the package.json file for the package you want to sign. Note: Don\'t include package.json in this parameter value.')
     .option('--output <output>', 'Optional. The output directory where you want to save the signed tarball file (.tgz). If unspecified, the package contents will be updated in place with the signed .attestation.p7m file.')
     .option('--email <email>', 'Email associated with the Unity account. If unspecified, the UNITY_USERNAME environment variable will be used.')
     .option('--password <password>', 'The password of the Unity account. If unspecified, the UNITY_PASSWORD environment variable will be used.')
     .option('--organization <organization>', 'The Organization ID you copied from the Unity Cloud Dashboard. If unspecified, the UNITY_ORGANIZATION_ID environment variable will be used.')
     .option('--verbose', 'Enable verbose logging.')
     .action(async (options) => {
+    logging_1.Logger.instance.warn('The sign-package command is deprecated. Use unity-cli upm-pack --source <path-to-package-folder> --destination <output-path> with UNITY_ORGANIZATION_ID or UNITY_ORG_ID, UPM_SERVICE_ACCOUNT_KEY_ID, and UPM_SERVICE_ACCOUNT_KEY_SECRET (or secure prompts).');
     if (options.verbose) {
         logging_1.Logger.instance.logLevel = logging_1.LogLevel.DEBUG;
     }
-    logging_1.Logger.instance.debug(JSON.stringify(options));
+    logging_1.Logger.instance.debugOptions(options);
     const packagePath = path.normalize(options.package?.toString()?.trim());
     if (!packagePath || packagePath.length === 0) {
         logging_1.Logger.instance.error('The package path is required. Use --package to specify it.');
@@ -700,6 +923,10 @@ program.command('sign-package')
         logging_1.Logger.instance.error('The organization ID is required. Use --organization to specify it.');
         process.exit(1);
     }
+    // Mask credentials in CI environments before any potential logging
+    logging_1.Logger.instance.maskCredential(username);
+    logging_1.Logger.instance.maskCredential(password);
+    logging_1.Logger.instance.maskCredential(organization);
     // must use a unity editor 6000.3 or newer
     const unityVersion = new unity_version_1.UnityVersion('6000.3');
     const unityHub = new unity_hub_1.UnityHub();
@@ -741,5 +968,8 @@ program.command('sign-package')
         }
     }
 });
-program.parse(process.argv);
+void program.parseAsync(process.argv).catch((err) => {
+    logging_1.Logger.instance.error(err instanceof Error ? err.message : String(err));
+    process.exit(1);
+});
 //# sourceMappingURL=cli.js.map