@nocobase/cli 2.1.0-beta.32 → 2.1.0-beta.34

package/dist/commands/app/down.js

@@ -6,7 +6,6 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import * as p from '@clack/prompts';
 import { Command, Flags } from '@oclif/core';
 import fsp from 'node:fs/promises';
 import os from 'node:os';
@@ -15,6 +14,7 @@ import { buildDockerDbContainerName, formatMissingManagedAppEnvMessage, resolveM
 import { getCurrentEnvName, removeEnv } from '../../lib/auth-store.js';
 import { resolveConfiguredEnvPath } from '../../lib/cli-home.js';
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
+import { confirm } from "../../lib/inquirer.js";
 import { commandOutput, commandSucceeds, run } from '../../lib/run-npm.js';
 import { failTask, isInteractiveTerminal, printInfo, startTask, succeedTask, } from '../../lib/ui.js';
 function resolveConfiguredPath(value) {
@@ -109,19 +109,17 @@ async function confirmDownAll(envName, force, options) {
         }
         throw new Error(`\`nb app down --all\` needs confirmation. Re-run with --force to delete everything for "${envName}" in non-interactive mode.`);
     }
-    const answer = await p.confirm({
-        message: usedCurrentEnv
-            ? `Delete everything for current env "${envName}"? This removes the app, managed containers, storage data, and the saved CLI env config.`
-            : `Delete everything for "${envName}"? This removes the app, managed containers, storage data, and the saved CLI env config.`,
-        active: 'yes',
-        inactive: 'no',
-        initialValue: false,
-    });
-    if (p.isCancel(answer)) {
-        p.cancel('Down cancelled.');
+    try {
+        return await confirm({
+            message: usedCurrentEnv
+                ? `Delete everything for current env "${envName}"? This removes the app, managed containers, storage data, and the saved CLI env config.`
+                : `Delete everything for "${envName}"? This removes the app, managed containers, storage data, and the saved CLI env config.`,
+            default: false,
+        });
+    }
+    catch {
         return false;
     }
-    return answer;
 }
 function formatDownCrossEnvForceRequiredMessage(currentEnv, requestedEnv) {
     return [
@@ -191,7 +189,6 @@ export default class AppDown extends Command {
                     yes: flags.yes,
                 });
                 if (!confirmed) {
-                    this.log('Canceled.');
                     return;
                 }
             }

package/dist/commands/app/logs.js

@@ -59,7 +59,6 @@ export default class AppLogs extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }

package/dist/commands/app/restart.js

@@ -8,6 +8,11 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
+import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, stopDockerContainer, } from '../../lib/app-runtime.js';
+import { formatAppUrl, resolveManagedAppApiBaseUrl, waitForAppReady } from '../../lib/app-health.js';
+import { recreateSavedDockerApp } from '../../lib/app-managed-resources.js';
+import { run } from '../../lib/run-npm.js';
+import { announceTargetEnv, failTask, startTask, succeedTask } from '../../lib/ui.js';
 function argvHasToken(argv, tokens) {
     return tokens.some((token) => argv.includes(token));
 }
@@ -16,9 +21,17 @@ function pushFlag(argv, flag, value) {
         argv.push(flag, String(value));
     }
 }
+function formatDockerRestartFailure(envName, message) {
+    return [
+        `Couldn't restart NocoBase for "${envName}".`,
+        'The CLI was not able to recreate the saved Docker app container successfully.',
+        'Check the saved Docker image, envFile, container settings, and database connection, then try again.',
+        `Details: ${message}`,
+    ].join('\n');
+}
 export default class AppRestart extends Command {
     static hidden = false;
-    static description = 'Restart NocoBase for the selected env by stopping it first, then starting it again.';
+    static description = 'Restart NocoBase for the selected env. Local npm/git installs stop and start the app again, and Docker installs recreate the saved app container so saved env changes can take effect.';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --env local',
@@ -68,10 +81,58 @@ export default class AppRestart extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }
+        const runtime = await resolveManagedAppRuntime(requestedEnv);
+        const commandStdio = flags.verbose ? 'inherit' : 'ignore';
+        if (!runtime) {
+            this.error(formatMissingManagedAppEnvMessage(requestedEnv));
+        }
+        if (runtime.kind === 'docker') {
+            announceTargetEnv(runtime.envName);
+            startTask(`Stopping NocoBase for "${runtime.envName}" before restart...`);
+            try {
+                const state = await stopDockerContainer(runtime.containerName, {
+                    stdio: commandStdio,
+                });
+                succeedTask(state === 'already-stopped'
+                    ? `NocoBase was already stopped for "${runtime.envName}".`
+                    : `Stopped NocoBase for "${runtime.envName}".`);
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                failTask(`Failed to stop NocoBase for "${runtime.envName}".`);
+                this.error(formatDockerRestartFailure(runtime.envName, message));
+            }
+            startTask(`Recreating the Docker app container for "${runtime.envName}"...`);
+            try {
+                await run('docker', ['rm', '-f', runtime.containerName], {
+                    errorName: 'docker rm',
+                    stdio: commandStdio,
+                }).catch(() => undefined);
+                await recreateSavedDockerApp(runtime, {
+                    verbose: flags.verbose,
+                });
+                succeedTask(`Docker app container is ready for "${runtime.envName}".`);
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                failTask(`Failed to recreate NocoBase for "${runtime.envName}".`);
+                this.error(formatDockerRestartFailure(runtime.envName, message));
+            }
+            const appUrl = formatAppUrl(runtime.env.appPort === undefined || runtime.env.appPort === null
+                ? undefined
+                : String(runtime.env.appPort));
+            await waitForAppReady({
+                envName: runtime.envName,
+                apiBaseUrl: resolveManagedAppApiBaseUrl(runtime),
+                containerName: runtime.containerName,
+                logHint: `You can inspect startup logs with \`nb app logs --env ${runtime.envName}\`.`,
+            });
+            succeedTask(`NocoBase is running for "${runtime.envName}"${appUrl ? ` at ${appUrl}` : ''}.`);
+            return;
+        }
         const stopArgv = [];
         const daemonFlagWasProvided = argvHasToken(this.argv, ['--daemon', '--no-daemon']);
         pushFlag(stopArgv, '--env', requestedEnv);

package/dist/commands/app/start.js

@@ -11,6 +11,7 @@ import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runLocalNocoBaseCommand, startDockerContainer, } from '../../lib/app-runtime.js';
 import { AppHealthCheckError, formatAppUrl, isAppReady, resolveManagedAppApiBaseUrl, waitForAppReady, } from '../../lib/app-health.js';
 import { ensureBuiltinDbReady, ensureSavedLocalSource, recreateSavedDockerApp, } from '../../lib/app-managed-resources.js';
+import { run } from '../../lib/run-npm.js';
 import { announceTargetEnv, failTask, printInfo, startTask, succeedTask } from '../../lib/ui.js';
 function argvHasToken(argv, tokens) {
     return tokens.some((token) => argv.includes(token));
@@ -89,6 +90,10 @@ export default class AppStart extends Command {
             description: 'Show raw startup output from the underlying local or Docker command',
             default: false,
         }),
+        recreate: Flags.boolean({
+            description: 'Recreate the saved Docker app container before starting it',
+            default: false,
+        }),
     };
     async run() {
         const { flags } = await this.parse(AppStart);
@@ -100,7 +105,6 @@ export default class AppStart extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }
@@ -150,29 +154,49 @@ export default class AppStart extends Command {
                 ? undefined
                 : String(runtime.env.appPort));
             const apiBaseUrl = resolveManagedAppApiBaseUrl(runtime);
-            startTask(`Starting NocoBase for "${runtime.envName}"...`);
-            try {
-                const state = await startDockerContainer(runtime.containerName, {
-                    stdio: commandStdio,
-                });
-                if (state === 'already-running' && await isAppReady(apiBaseUrl)) {
-                    succeedTask(`NocoBase is already running for "${runtime.envName}"${appUrl ? ` at ${appUrl}` : ''}.`);
-                    return;
-                }
-            }
-            catch (error) {
-                const message = error instanceof Error ? error.message : String(error);
-                if (/does not exist/i.test(message)) {
-                    printInfo(`The saved Docker app container for "${runtime.envName}" is missing. Recreating it from the saved Docker env settings...`);
+            if (flags.recreate) {
+                startTask(`Recreating the Docker app container for "${runtime.envName}"...`);
+                try {
+                    await run('docker', ['rm', '-f', runtime.containerName], {
+                        errorName: 'docker rm',
+                        stdio: commandStdio,
+                    }).catch(() => undefined);
                     await recreateSavedDockerApp(runtime, {
                         verbose: flags.verbose,
                     });
+                    succeedTask(`Docker app container is ready for "${runtime.envName}".`);
                 }
-                else {
-                    failTask(`Failed to start NocoBase for "${runtime.envName}".`);
+                catch (error) {
+                    const message = error instanceof Error ? error.message : String(error);
+                    failTask(`Failed to recreate NocoBase for "${runtime.envName}".`);
                     this.error(formatDockerStartFailure(runtime.envName, message));
                 }
             }
+            else {
+                startTask(`Starting NocoBase for "${runtime.envName}"...`);
+                try {
+                    const state = await startDockerContainer(runtime.containerName, {
+                        stdio: commandStdio,
+                    });
+                    if (state === 'already-running' && await isAppReady(apiBaseUrl)) {
+                        succeedTask(`NocoBase is already running for "${runtime.envName}"${appUrl ? ` at ${appUrl}` : ''}.`);
+                        return;
+                    }
+                }
+                catch (error) {
+                    const message = error instanceof Error ? error.message : String(error);
+                    if (/does not exist/i.test(message)) {
+                        printInfo(`The saved Docker app container for "${runtime.envName}" is missing. Recreating it from the saved Docker env settings...`);
+                        await recreateSavedDockerApp(runtime, {
+                            verbose: flags.verbose,
+                        });
+                    }
+                    else {
+                        failTask(`Failed to start NocoBase for "${runtime.envName}".`);
+                        this.error(formatDockerStartFailure(runtime.envName, message));
+                    }
+                }
+            }
             await waitForAppReady({
                 envName: runtime.envName,
                 apiBaseUrl,

package/dist/commands/app/stop.js

@@ -59,7 +59,6 @@ export default class AppStop extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }

package/dist/commands/app/upgrade.js

@@ -11,6 +11,7 @@ import { upsertEnv } from '../../lib/auth-store.js';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runLocalNocoBaseCommand, startDockerContainer, stopDockerContainer, } from '../../lib/app-runtime.js';
 import { resolveConfiguredEnvPath } from '../../lib/cli-home.js';
 import { deriveBuiltinDbConnection } from '../../lib/builtin-db.js';
+import { resolveDockerEnvFileArg } from "../../lib/docker-env-file.js";
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
 import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_VERSION, resolveDockerImageRef, } from "../../lib/docker-image.js";
 import { commandSucceeds, run } from '../../lib/run-npm.js';
@@ -311,12 +312,13 @@ export default class AppUpgrade extends Command {
         argv.push('--daemon');
         return argv;
     }
-    static buildDockerUpgradePlan(runtime, downloadVersion) {
+    static async buildDockerUpgradePlan(runtime, downloadVersion) {
         const dockerRegistry = readEnvValue(runtime.env, 'dockerRegistry') || DEFAULT_DOCKER_REGISTRY;
         const appPort = runtime.env.appPort === undefined || runtime.env.appPort === null
             ? ''
             : trimValue(runtime.env.appPort);
         const storagePath = readEnvValue(runtime.env, 'storagePath');
+        const envFile = await resolveDockerEnvFileArg(runtime.envName, runtime.env.config);
         const appKey = readEnvValue(runtime.env, 'appKey');
         const timeZone = readEnvValue(runtime.env, 'timezone');
         const builtinDbConnection = runtime.env.config.builtinDb ? deriveBuiltinDbConnection(runtime) : undefined;
@@ -378,6 +380,9 @@ export default class AppUpgrade extends Command {
         if (appPort) {
             args.push('-p', `${appPort}:80`);
         }
+        if (envFile) {
+            args.push('--env-file', envFile);
+        }
         args.push('-e', `APP_KEY=${appKey}`, '-e', `DB_DIALECT=${dbDialect}`, '-e', `DB_HOST=${dbHost}`, '-e', `DB_PORT=${dbPort}`, '-e', `DB_DATABASE=${dbDatabase}`, '-e', `DB_USER=${dbUser}`, '-e', `DB_PASSWORD=${dbPassword}`, '-e', `TZ=${timeZone}`, '-v', `${storagePath}:${DOCKER_APP_STORAGE_DESTINATION}`, imageRef);
         return {
             containerName: runtime.containerName,
@@ -387,6 +392,7 @@ export default class AppUpgrade extends Command {
             imageRef,
             appPort: appPort || undefined,
             storagePath,
+            envFile,
             appKey,
             timeZone,
             dbDialect,
@@ -452,7 +458,7 @@ export default class AppUpgrade extends Command {
         const apiBaseUrl = resolveApiBaseUrl(runtime);
         const containerExists = await dockerContainerExists(runtime.containerName);
         if (!flags['skip-code-update']) {
-            const plan = AppUpgrade.buildDockerUpgradePlan(runtime, downloadVersion);
+            const plan = await AppUpgrade.buildDockerUpgradePlan(runtime, downloadVersion);
             startTask(`Refreshing the Docker image for "${runtime.envName}"...`);
             try {
                 await runCommand('source:download', AppUpgrade.buildDockerDownloadArgv(runtime, plan));
@@ -500,7 +506,7 @@ export default class AppUpgrade extends Command {
             }
         }
         else {
-            const plan = AppUpgrade.buildDockerUpgradePlan(runtime, downloadVersion);
+            const plan = await AppUpgrade.buildDockerUpgradePlan(runtime, downloadVersion);
             const displayUrl = formatDisplayUrl(apiBaseUrl, plan.appPort);
             startTask(`Recreating the Docker app container for "${runtime.envName}"...`);
             try {
@@ -560,7 +566,6 @@ export default class AppUpgrade extends Command {
                 yes: parsed.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }

package/dist/commands/env/add.js

@@ -13,8 +13,7 @@ import { buildStoredEnvConfig, } from '../../lib/env-config.js';
 import { runPromptCatalog, } from '../../lib/prompt-catalog.js';
 import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, localeText, } from '../../lib/cli-locale.js';
 import { validateApiBaseUrl } from '../../lib/prompt-validators.js';
-import { printVerbose, setVerboseMode } from '../../lib/ui.js';
-import * as p from '@clack/prompts';
+import { printStage, printSuccess, printVerbose, setVerboseMode } from '../../lib/ui.js';
 const ENV_RUNTIME_FLAG_MAP = {
     source: 'source',
     'download-version': 'downloadVersion',
@@ -292,7 +291,7 @@ export default class EnvAdd extends Command {
         applyCliLocale(parsedFlags.locale);
         setVerboseMode(parsedFlags.verbose);
         if (!parsedFlags['no-intro']) {
-            p.intro('Connect a NocoBase Environment');
+            printStage('Connect to NocoBase');
         }
         const results = await runPromptCatalog(EnvAdd.prompts, {
             values: this.buildPromptValues(args.name, parsedFlags),
@@ -308,6 +307,6 @@ export default class EnvAdd extends Command {
             await this.config.runCommand('env:auth', [envName]);
         }
         await this.config.runCommand('env:update', [envName]);
-        p.outro(`Env "${envName}" added successfully.`);
+        printSuccess(`✔ Env "${envName}" is ready.`);
     }
 }

package/dist/commands/env/auth.js

@@ -10,7 +10,7 @@ import { Args, Command, Flags } from '@oclif/core';
 import { getCurrentEnvName } from '../../lib/auth-store.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { authenticateEnvWithOauth } from '../../lib/env-auth.js';
-import { failTask, startTask, succeedTask } from '../../lib/ui.js';
+import { failTask, printStage, startTask, succeedTask } from '../../lib/ui.js';
 export default class EnvAuth extends Command {
     static summary = 'Sign in to a saved NocoBase environment with OAuth';
     static examples = [
@@ -39,13 +39,14 @@ export default class EnvAuth extends Command {
             this.error(`Environment name was provided both as the argument ("${nameArg}") and as --env ("${nameFlag}"). Please use only one.`);
         }
         const envName = nameArg || nameFlag || (await getCurrentEnvName({ scope: resolveDefaultConfigScope() }));
+        printStage('Signing in');
         startTask(`Starting browser sign-in for "${envName}"...`);
         try {
             await authenticateEnvWithOauth({
                 envName,
                 scope: resolveDefaultConfigScope(),
             });
-            succeedTask(`Signed in to "${envName}".`);
+            succeedTask(`✔ Signed in to "${envName}".`);
         }
         catch (error) {
             failTask(`Sign-in failed for "${envName}".`);

package/dist/commands/env/remove.js

@@ -7,19 +7,26 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Args, Command, Flags } from '@oclif/core';
-import { getCurrentEnvName, removeEnv } from '../../lib/auth-store.js';
+import { getCurrentEnvName, loadAuthConfig, removeEnv } from '../../lib/auth-store.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
-import { confirmAction, isInteractiveTerminal, printVerbose, setVerboseMode } from '../../lib/ui.js';
+import { confirm } from "../../lib/inquirer.js";
+import { isInteractiveTerminal, printVerbose, setVerboseMode } from '../../lib/ui.js';
 export default class EnvRemove extends Command {
     static summary = 'Remove a configured environment';
+    static description = 'Remove the saved CLI env config for an environment. This command does not clean local app files, containers, or storage data.';
     static examples = [
         '<%= config.bin %> <%= command.id %> staging',
-        '<%= config.bin %> <%= command.id %> staging -f',
+        '<%= config.bin %> <%= command.id %> staging --yes',
     ];
     static flags = {
+        yes: Flags.boolean({
+            char: 'y',
+            description: 'Skip confirmation and remove the saved CLI env config',
+            default: false,
+        }),
         force: Flags.boolean({
             char: 'f',
-            description: 'Remove without confirmation',
+            hidden: true,
             default: false,
         }),
         verbose: Flags.boolean({
@@ -36,24 +43,42 @@ export default class EnvRemove extends Command {
     async run() {
         const { args, flags } = await this.parse(EnvRemove);
         setVerboseMode(flags.verbose);
-        const currentEnv = await getCurrentEnvName({ scope: resolveDefaultConfigScope() });
-        if (args.name === currentEnv && !flags.force) {
+        const scope = resolveDefaultConfigScope();
+        const config = await loadAuthConfig({ scope });
+        if (!config.envs[args.name]) {
+            this.error(`Env "${args.name}" is not configured`);
+        }
+        const currentEnv = await getCurrentEnvName({ scope });
+        const skipConfirmation = flags.yes || flags.force;
+        if (!skipConfirmation) {
             if (!isInteractiveTerminal()) {
-                this.error('Refusing to remove the current env without confirmation. Re-run with `--force`.');
+                this.error(`Refusing to remove env "${args.name}" without confirmation in non-interactive mode. Re-run with \`--yes\` to remove only the saved CLI env config.`);
+            }
+            const subject = args.name === currentEnv ? `current env "${args.name}"` : `env "${args.name}"`;
+            let confirmed = false;
+            try {
+                confirmed = await confirm({
+                    message: `Remove ${subject}? Only the saved CLI env config will be removed.`,
+                    default: false,
+                });
+            }
+            catch {
+                return;
             }
-            const confirmed = await confirmAction(`Remove current env "${args.name}"?`, { defaultValue: false });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }
         printVerbose(`Removing env "${args.name}"`);
-        const result = await removeEnv(args.name, { scope: resolveDefaultConfigScope() });
-        this.log(`Removed env "${result.removed}".`);
+        const result = await removeEnv(args.name, { scope });
         if (result.hasEnvs) {
-            this.log(`Current env: ${await getCurrentEnvName({ scope: resolveDefaultConfigScope() })}`);
+            if (args.name === currentEnv) {
+                this.log(`Removed env "${result.removed}". Switched current env to "${await getCurrentEnvName({ scope })}".`);
+                return;
+            }
+            this.log(`Removed env "${result.removed}".`);
             return;
         }
-        this.log('No envs configured.');
+        this.log(`Removed env "${result.removed}". No envs configured.`);
     }
 }

package/dist/commands/env/update.js

@@ -12,7 +12,7 @@ import { Args, Command, Flags } from '@oclif/core';
 import { getCurrentEnvName } from '../../lib/auth-store.js';
 import { updateEnvRuntime } from '../../lib/bootstrap.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
-import { failTask, startTask, succeedTask } from '../../lib/ui.js';
+import { failTask, printVerbose, setVerboseMode, startTask, stopTask, succeedTask } from '../../lib/ui.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 export default class EnvUpdate extends Command {
     static summary = 'Refresh an environment runtime from swagger:get and persist connection overrides';
@@ -44,6 +44,7 @@ export default class EnvUpdate extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(EnvUpdate);
+        setVerboseMode(Boolean(flags.verbose));
         const envName = args.name;
         const envLabel = envName ?? (await getCurrentEnvName({ scope: resolveDefaultConfigScope() }));
         startTask(`Updating env runtime: ${envLabel}`);
@@ -57,7 +58,13 @@ export default class EnvUpdate extends Command {
                 configFile: path.join(path.dirname(path.dirname(path.dirname(__dirname))), 'nocobase-ctl.config.json'),
                 verbose: flags.verbose,
             });
-            succeedTask(`Updated env "${envLabel}" to runtime "${runtime.version}".`);
+            if (flags.verbose) {
+                succeedTask(`Updated env "${envLabel}" to runtime "${runtime.version}".`);
+            }
+            else {
+                stopTask();
+                printVerbose(`Updated env "${envLabel}" to runtime "${runtime.version}".`);
+            }
         }
         catch (error) {
             failTask(`Failed to update env "${envLabel}".`);

package/dist/commands/examples/prompts-stages.js

@@ -44,8 +44,8 @@ function buildWebUiStagesFromTestPrompts(c) {
 }
 /**
  * With `--ui`: `runPromptCatalogWebUI` using `stages` + `sectionTitle`, then
- * `runPromptCatalog` on the same catalog as `prompts-test`. Without `--ui`, same terminal behavior
- * as `prompts-test` (handy for comparing).
+ * `runPromptCatalog` on the same catalog as `prompts-test`. Without `--ui`, the same terminal prompt
+ * behavior as `prompts-test` (handy for comparing).
  */
 export default class PromptsStages extends Command {
     static hidden = true;
@@ -60,12 +60,12 @@ export default class PromptsStages extends Command {
     ];
     static flags = {
         ui: Flags.boolean({
-            description: 'Open the localhost form: `runPromptCatalogWebUI` with `stages` and `sectionTitle` (vs `prompts-test --ui`, which uses one `catalog`). Without --ui, behavior matches `prompts-test` (Clack in TTY / presets).',
+            description: 'Open the localhost form: `runPromptCatalogWebUI` with `stages` and `sectionTitle` (vs `prompts-test --ui`, which uses one `catalog`). Without --ui, behavior matches `prompts-test` (terminal prompt layer in TTY / presets).',
             default: false,
         }),
         yes: Flags.boolean({
             char: 'y',
-            description: 'Accept defaults only in the terminal (no Clack after submit); same semantics as `prompts-test` when used with the submitted or default preset.',
+            description: 'Accept defaults only in the terminal (no extra interactive prompts after submit); same semantics as `prompts-test` when used with the submitted or default preset.',
             default: false,
         }),
         locale: Flags.string({

package/dist/commands/examples/prompts-test.js

@@ -6,10 +6,10 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import * as p from '@clack/prompts';
 import { Args, Command, Flags } from '@oclif/core';
 import { runPromptCatalog, } from "../../lib/prompt-catalog.js";
 import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, } from "../../lib/cli-locale.js";
+import { printInfo } from "../../lib/ui.js";
 import { runPromptCatalogWebUI, } from "../../lib/prompt-web-ui.js";
 export default class PromptsTest extends Command {
     static hidden = true;
@@ -84,7 +84,7 @@ export default class PromptsTest extends Command {
             initialValue: 'world',
             placeholder: 'Your name',
             /**
-             * Example: async validation (Clack re-prompts; Web UI returns 400 on submit with this message).
+             * Example: async validation (the terminal prompt layer re-prompts; Web UI returns 400 on submit with this message).
              */
             validate: async (v) => {
                 if (String(v).trim().length < 2) {
@@ -109,7 +109,7 @@ export default class PromptsTest extends Command {
             type: 'run',
             when: (values) => values.select === 'option1',
             run: (values) => {
-                p.log.info(`run block: select is option1 (current keys: ${Object.keys(values).join(', ')})`);
+                printInfo(`run block: select is option1 (current keys: ${Object.keys(values).join(', ')})`);
             },
         },
         password: {
@@ -154,7 +154,7 @@ export default class PromptsTest extends Command {
         });
         this.log(JSON.stringify(results, null, 2));
     }
-    /** Map oclif parse result into `values` presets: each key here skips that prompt (no Clack UI). */
+    /** Map oclif parse result into `values` presets: each key here skips that prompt (no terminal prompt UI). */
     buildPresetValuesFromParsed(args, flags) {
         const preset = {};
         const file = args.file ?? flags.file;