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

package/dist/commands/init.js

@@ -7,7 +7,6 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command, Flags } from '@oclif/core';
-import * as p from '@clack/prompts';
 import pc from 'picocolors';
 import { existsSync } from 'node:fs';
 import path from 'node:path';
@@ -19,10 +18,11 @@ import { resolveDefaultConfigScope } from '../lib/cli-home.js';
 import { runPromptCatalogWebUI, } from "../lib/prompt-web-ui.js";
 import { validateApiBaseUrl, validateEnvKey } from "../lib/prompt-validators.js";
 import { inspectSkillsStatus, installNocoBaseSkills, updateNocoBaseSkills, } from '../lib/skills-manager.js';
+import { omitKeys, pickKeys } from "../lib/object-utils.js";
+import { printInfo, printStage, printVerbose, printWarning } from '../lib/ui.js';
 import Download from "./download.js";
 import EnvAdd from "./env/add.js";
 import Install, { defaultDbPortForDialect } from "./install.js";
-import _ from 'lodash';
 const DEFAULT_INIT_API_BASE_URL = 'http://localhost:13000/api';
 const DEFAULT_INIT_APP_NAME = 'local';
 const DOWNLOAD_OUTPUT_DIR_PROMPT = Download.prompts.outputDir;
@@ -129,15 +129,18 @@ function shellQuoteArg(value) {
         : `'${value.replace(/'/g, `'\\''`)}'`;
 }
 function initTitle() {
-    return translateCli('commands.init.messages.title');
+    return 'Set up NocoBase';
+}
+function logInitStage(title) {
+    printStage(title);
 }
 function logInitUiReady(command, url) {
-    p.log.step(translateCli('commands.init.messages.uiReady'));
-    p.log.info(translateCli('commands.init.messages.uiReadyHelp'));
+    command.log(translateCli('commands.init.messages.uiReady'));
+    command.log(translateCli('commands.init.messages.uiReadyHelp'));
     command.log(`URL: ${url}`);
 }
 function logInitUiBrowserOpenFallback() {
-    p.log.warn(translateCli('commands.init.messages.uiOpenBrowserFallback'));
+    printWarning(translateCli('commands.init.messages.uiOpenBrowserFallback'));
 }
 function formatBrowserOpenError(error) {
     if (error instanceof Error) {
@@ -313,8 +316,8 @@ Prompt modes:
             min: 0,
             max: 65535,
         }),
-        ..._.pick(EnvAdd.flags, INIT_ENV_ADD_FLAG_NAMES),
-        ..._.omit(Install.flags, ['yes', 'env']),
+        ...pickKeys(EnvAdd.flags, INIT_ENV_ADD_FLAG_NAMES),
+        ...omitKeys(Install.flags, ['yes', 'env']),
     };
     async run() {
         const parsedResult = await this.parse(Init);
@@ -337,10 +340,10 @@ Prompt modes:
         if (normalizedFlags.resume) {
             const envName = String(normalizedFlags.env ?? '').trim();
             if (!envName) {
-                p.log.error(formatResumeEnvRequiredMessage());
+                this.error(formatResumeEnvRequiredMessage());
                 this.exit(1);
             }
-            p.intro(initTitle());
+            logInitStage(initTitle());
             await this.syncNocoBaseSkills({
                 skip: Boolean(normalizedFlags['skip-skills']),
             });
@@ -351,7 +354,6 @@ Prompt modes:
                 const message = error instanceof Error ? error.message : String(error);
                 this.error(message);
             }
-            p.outro('Workspace init finished.');
             return;
         }
         const interactive = Boolean(stdinStream.isTTY && stdoutStream.isTTY);
@@ -377,21 +379,21 @@ Prompt modes:
         }
         if (normalizedFlags.yes && !String(presetValues.appName ?? '').trim()) {
             const formatted = formatSkippedAppNameRequiredMessage();
-            p.log.error(highlightInitValidationMessage(formatted));
+            this.error(highlightInitValidationMessage(formatted));
             this.exit(1);
         }
         const appName = String(presetValues.appName ?? '').trim();
         if (useBrowserUi) {
-            p.intro(initTitle());
-            p.log.info(translateCli('commands.init.messages.uiOpening'));
+            logInitStage(initTitle());
+            this.log(translateCli('commands.init.messages.uiOpening'));
         }
         else {
-            p.intro(initTitle());
+            logInitStage(initTitle());
             if (normalizedFlags.yes) {
-                p.log.info(`Prompts skipped (--yes). NocoBase will be installed for env "${appName}" using the provided flags and safe defaults.`);
+                printInfo(`Non-interactive setup for env "${appName}" (--yes).`);
             }
             else if (!interactive) {
-                p.log.warn('No interactive terminal detected. NocoBase will be installed using the provided flags and safe defaults.');
+                printWarning('No interactive terminal detected. NocoBase will be installed using the provided flags and safe defaults.');
             }
         }
         const dynamicInitialValues = await Init.buildDynamicInitialValuesForInstall(normalizedFlags, presetValues);
@@ -412,7 +414,7 @@ Prompt modes:
                 },
                 onOpenBrowserError: (_url, err) => {
                     logInitUiBrowserOpenFallback();
-                    p.log.info(`Browser open error: ${formatBrowserOpenError(err)}`);
+                    this.log(`Browser open error: ${formatBrowserOpenError(err)}`);
                 },
             });
         }
@@ -422,12 +424,11 @@ Prompt modes:
             yes: normalizedFlags.yes || useBrowserUi || !interactive,
             hooks: {
                 onCancel: () => {
-                    p.cancel('Init cancelled.');
                     this.exit(0);
                 },
                 onMissingNonInteractive: (message) => {
                     const formatted = formatInitValidationMessage(message);
-                    p.log.error(highlightInitValidationMessage(formatted));
+                    this.error(highlightInitValidationMessage(formatted));
                     this.exit(1);
                 },
             },
@@ -438,7 +439,7 @@ Prompt modes:
             ? await getEnv(String(results.appName ?? '').trim(), { scope: resolveDefaultConfigScope() })
             : undefined;
         if (existingEnv && Boolean(normalizedFlags.force)) {
-            p.log.warn(`Reconfiguring existing env ${pc.cyan(pc.bold(`"${existingEnv.name}"`))} from the global config because ${pc.bold('--force')} was set. The env config will be updated before install starts, then refreshed again after install succeeds.`);
+            printWarning(`Reconfiguring existing env ${pc.cyan(pc.bold(`"${existingEnv.name}"`))} from the global config because ${pc.bold('--force')} was set. The env config will be updated before install starts, then refreshed again after install succeeds.`);
         }
         await this.syncNocoBaseSkills({
             skip: Boolean(normalizedFlags['skip-skills']),
@@ -447,14 +448,16 @@ Prompt modes:
         try {
             // oclif explicit registry keys use `:` (e.g. `env:add`); users still type `nb env add`.
             if (hasNocobase) {
-                p.log.step('Running nb env add');
+                logInitStage('Connecting to the env');
+                printVerbose('Running nb env add');
                 await this.config.runCommand('env:add', this.buildEnvAddArgv(results));
             }
             else {
-                p.log.step('Saving the local env config');
+                logInitStage('Saving env config');
                 await this.persistManagedEnvConfig(results, normalizedFlags);
                 managedInstallResults = results;
-                p.log.step('Running nb init');
+                printInfo(`Saved env config for "${String(results.appName ?? DEFAULT_INIT_APP_NAME).trim() || DEFAULT_INIT_APP_NAME}".`);
+                printVerbose('Running nb init');
                 await this.config.runCommand('install', this.buildInstallArgv(results, normalizedFlags));
             }
         }
@@ -463,10 +466,9 @@ Prompt modes:
             const formatted = managedInstallResults
                 ? this.formatManagedInstallFailureMessage(message, managedInstallResults, normalizedFlags)
                 : message;
-            p.outro(pc.red(formatted));
+            this.error(pc.red(formatted));
             this.exit(1);
         }
-        p.outro('Workspace init finished.');
     }
     static async buildDynamicInitialValuesForInstall(flags, presetValues) {
         const out = {};
@@ -706,22 +708,25 @@ Prompt modes:
     }
     async syncNocoBaseSkills(options) {
         if (options?.skip) {
-            p.log.step('Skipped NocoBase agent skills sync.');
+            printVerbose('Skipped agent skills sync.');
             return;
         }
         try {
+            logInitStage('Syncing agent skills');
             const status = await inspectSkillsStatus();
             if (!status.installed) {
-                p.log.step('Installing NocoBase agent skills (nb skills install)');
+                printVerbose('Installing NocoBase agent skills (nb skills install)');
                 await installNocoBaseSkills();
+                printInfo('Agent skills ready.');
                 return;
             }
-            p.log.step('Updating NocoBase agent skills (nb skills update)');
+            printVerbose('Updating NocoBase agent skills (nb skills update)');
             await updateNocoBaseSkills();
+            printInfo('Agent skills ready.');
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            p.outro(pc.red(`Skills sync failed: ${message}`));
+            this.error(pc.red(`Skills sync failed: ${message}`));
             this.exit(1);
         }
     }
@@ -798,9 +803,11 @@ Prompt modes:
         if (options?.nonInteractive ?? true) {
             argv.unshift('-y');
         }
+        argv.push('--skip-save-env-log');
         const processArgv = process.argv.slice(2);
         const envName = String(results.appName ?? DEFAULT_INIT_APP_NAME).trim() || DEFAULT_INIT_APP_NAME;
         const source = String(results.source ?? '').trim();
+        const hasNocobase = String(results.hasNocobase ?? '').trim() === 'yes';
         const apiBaseUrl = String(results.apiBaseUrl ?? '').trim();
         const authType = String(results.authType ?? '').trim();
         const accessToken = String(results.accessToken ?? '');
@@ -811,7 +818,7 @@ Prompt modes:
         if (Boolean(flags.verbose)) {
             argv.push('--verbose');
         }
-        if (apiBaseUrl) {
+        if (hasNocobase && apiBaseUrl) {
             argv.push('--api-base-url', apiBaseUrl);
         }
         if (authType) {

package/dist/commands/install.js

@@ -7,8 +7,6 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command, Flags } from '@oclif/core';
-import * as p from '@clack/prompts';
-import _ from 'lodash';
 import { spawn } from 'node:child_process';
 import crypto from 'node:crypto';
 import { mkdir } from 'node:fs/promises';
@@ -24,9 +22,11 @@ import { findAvailableTcpPort, validateAvailableTcpPort, validateTcpPort, valida
 import { validateExternalDbConfig } from "../lib/db-connection-check.js";
 import { formatMissingManagedAppEnvMessage } from '../lib/app-runtime.js';
 import { run, runNocoBaseCommand } from '../lib/run-npm.js';
-import { startTask, stopTask, updateTask } from '../lib/ui.js';
+import { printInfo, printStage, printVerbose, printWarning, setVerboseMode, } from '../lib/ui.js';
+import { omitKeys, upperFirst } from "../lib/object-utils.js";
 import { getEnv, setCurrentEnv, upsertEnv } from '../lib/auth-store.js';
 import { buildStoredEnvConfig } from '../lib/env-config.js';
+import { resolveDockerEnvFileArg, } from "../lib/docker-env-file.js";
 import Download, { defaultDockerRegistryForLang, } from './download.js';
 import EnvAdd from "./env/add.js";
 const DEFAULT_INSTALL_ENV_NAME = 'local';
@@ -260,6 +260,13 @@ async function commandOutput(command, args, options) {
     });
 }
 export default class Install extends Command {
+    ensuredDockerNetworks = new Set();
+    logStage(title) {
+        printStage(title);
+    }
+    logDetail(message) {
+        printVerbose(message);
+    }
     static hidden = true;
     static description = 'Install NocoBase: database, storage, admin user, and `nocobase-v1 install`. Optionally run `nb source download` first; distribution and image details are configured on `nb source download`, not here. Use `--resume` to continue an interrupted setup from the saved workspace env config.';
     static examples = [
@@ -288,6 +295,10 @@ export default class Install extends Command {
             description: 'Show detailed command output',
             default: false,
         }),
+        'skip-save-env-log': Flags.boolean({
+            hidden: true,
+            default: false,
+        }),
         env: Flags.string({
             char: 'e',
             description: 'App/env name to create or update. Defaults app paths to ./<envName>/source/ and ./<envName>/storage/.',
@@ -373,7 +384,7 @@ export default class Install extends Command {
             description: 'Download NocoBase app files or pull a Docker image before installing',
             default: false,
         }),
-        ..._.omit(Download.flags, ['yes']),
+        ...omitKeys(Download.flags, ['yes']),
     };
     /** Environment name only: run before {@link Install.prompts} (see `run`). */
     static envPrompts = {
@@ -797,7 +808,7 @@ export default class Install extends Command {
         const database = String(dbResults.dbDatabase ?? '').trim();
         const address = host && port ? `${host}:${port}` : host || port || '(unknown address)';
         const target = database ? `${address}/${database}` : address;
-        p.log.step(`Checking external ${dialect} database: ${target}`);
+        printVerbose(`Checking external ${dialect} database: ${target}`);
         const validationError = await validateExternalDbConfig(dbResults);
         if (validationError) {
             throw new Error(validationError);
@@ -1026,7 +1037,7 @@ export default class Install extends Command {
         }
         const nextPort = await findAvailableTcpPort();
         if (options?.warn) {
-            p.log.warn(`${options.label ?? 'Default port'} ${normalized} is already in use. Using available port ${nextPort} for this setup.`);
+            printWarning(`${options.label ?? 'Default port'} ${normalized} is already in use. Using available port ${nextPort} for this setup.`);
         }
         return nextPort;
     }
@@ -1093,7 +1104,6 @@ export default class Install extends Command {
             yes: false,
             hooks: {
                 onCancel: () => {
-                    p.cancel('Download cancelled.');
                     exit(0);
                 },
                 onMissingNonInteractive: (message) => {
@@ -1443,18 +1453,23 @@ export default class Install extends Command {
         throw new Error(`Built-in database does not support "${dbDialect}" yet. Please choose PostgreSQL, MySQL, MariaDB, or KingbaseES.`);
     }
     async ensureDockerNetwork(name) {
-        p.log.step(`Checking Docker network: ${name}`);
+        if (this.ensuredDockerNetworks.has(name)) {
+            return;
+        }
+        printVerbose(`Checking Docker network: ${name}`);
         const exists = await commandSucceeds('docker', ['network', 'inspect', name]);
         if (exists) {
-            p.log.info(`Docker network already exists: ${name}`);
+            printVerbose(`Docker network already exists: ${name}`);
+            this.ensuredDockerNetworks.add(name);
             return;
         }
-        p.log.step(`Creating Docker network: ${name}`);
+        printVerbose(`Creating Docker network: ${name}`);
         try {
             await run('docker', ['network', 'create', name], {
                 errorName: 'docker network create',
             });
-            p.log.info(`Docker network is ready: ${name}`);
+            printVerbose(`Docker network is ready: ${name}`);
+            this.ensuredDockerNetworks.add(name);
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
@@ -1489,7 +1504,7 @@ export default class Install extends Command {
         if (!params.force) {
             return true;
         }
-        p.log.info(`Removing existing ${params.displayName}: ${params.containerName}`);
+        printVerbose(`Removing existing ${params.displayName}: ${params.containerName}`);
         await this.removeDockerContainer(params.containerName);
         return false;
     }
@@ -1513,7 +1528,7 @@ export default class Install extends Command {
     async ensureBuiltinDbContainer(plan, options) {
         const exists = await this.dockerContainerExists(plan.containerName);
         if (exists) {
-            p.log.info(`Built-in ${plan.dbDialect} container already exists: ${plan.containerName}`);
+            printVerbose(`Built-in ${plan.dbDialect} container already exists: ${plan.containerName}`);
             return;
         }
         await mkdir(plan.dataDir, { recursive: true });
@@ -1540,7 +1555,8 @@ export default class Install extends Command {
             dbPassword: params.dbResults.dbPassword,
             builtinDbImage: params.dbResults.builtinDbImage,
         });
-        p.log.step(`Preparing built-in ${plan.dbDialect} database`);
+        this.logStage('Preparing database');
+        printInfo(`Using built-in ${plan.dbDialect} database.`);
         await this.ensureDockerNetwork(plan.networkName);
         const existingContainerKept = await this.removeDockerContainerIfForced({
             containerName: plan.containerName,
@@ -1556,10 +1572,11 @@ export default class Install extends Command {
         await this.ensureBuiltinDbContainer(plan, {
             stdio: params.commandStdio ?? 'ignore',
         });
-        p.log.info(`Built-in ${plan.dbDialect} database is ready at ${plan.dbHost}:${plan.dbPort}`);
+        printInfo(`${upperFirst(plan.dbDialect)} database ready.`);
+        printVerbose(`Built-in ${plan.dbDialect} database ready at ${plan.dbHost}:${plan.dbPort}`);
         return plan;
     }
-    static buildDockerAppPlan(params) {
+    static async buildDockerAppPlan(params) {
         const dockerRegistry = String(downloadResultsValue(params.downloadResults, 'dockerRegistry') ?? '').trim()
             || defaultDockerRegistryForLang(process.env.NB_LOCALE);
         const version = String(downloadResultsValue(params.downloadResults, 'version') ?? '').trim() || DEFAULT_DOCKER_VERSION;
@@ -1582,6 +1599,8 @@ export default class Install extends Command {
         const appKey = crypto.randomBytes(32).toString('hex');
         const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC';
         const containerName = Install.buildDockerAppContainerName(params.envName, params.dockerContainerPrefix ?? params.workspaceName);
+        const configuredEnvFile = String(params.appResults.envFile ?? '').trim();
+        const envFile = await resolveDockerEnvFileArg(params.envName, configuredEnvFile ? { envFile: configuredEnvFile } : undefined);
         const initEnvVars = Install.buildInitAppEnvVars({
             appResults: params.appResults,
             rootResults: params.rootResults,
@@ -1598,6 +1617,9 @@ export default class Install extends Command {
             '-p',
             `${appPort}:80`,
         ];
+        if (envFile) {
+            args.push('--env-file', envFile);
+        }
         for (const [key, value] of Object.entries(initEnvVars)) {
             args.push('-e', `${key}=${value}`);
         }
@@ -1609,6 +1631,7 @@ export default class Install extends Command {
             imageRef,
             appPort,
             storagePath,
+            envFile,
             appKey,
             timeZone,
             args,
@@ -1617,7 +1640,7 @@ export default class Install extends Command {
     async ensureDockerAppContainer(plan, options) {
         const exists = await this.dockerContainerExists(plan.containerName);
         if (exists) {
-            p.log.info(`App container already exists: ${plan.containerName}`);
+            printVerbose(`App container already exists: ${plan.containerName}`);
             return 'existing';
         }
         await mkdir(plan.storagePath, { recursive: true });
@@ -1631,7 +1654,7 @@ export default class Install extends Command {
         const networkName = params.builtinDbPlan?.networkName
             ?? Install.buildBuiltinDbNetworkName(params.envName, params.dockerNetworkName ?? params.workspaceName);
         await this.ensureDockerNetwork(networkName);
-        const plan = Install.buildDockerAppPlan({
+        const plan = await Install.buildDockerAppPlan({
             envName: params.envName,
             workspaceName: params.workspaceName,
             dockerContainerPrefix: params.dockerContainerPrefix,
@@ -1641,7 +1664,7 @@ export default class Install extends Command {
             rootResults: params.rootResults,
             networkName,
         });
-        p.log.step(`Starting Docker app ${plan.imageRef}`);
+        printVerbose('Starting NocoBase app (Docker)');
         await this.removeDockerContainerIfForced({
             containerName: plan.containerName,
             displayName: 'app container',
@@ -1655,7 +1678,7 @@ export default class Install extends Command {
             plan.appKey = env.APP_KEY || plan.appKey;
             plan.timeZone = env.TZ || plan.timeZone;
         }
-        p.log.info(`App container is ready at http://127.0.0.1:${plan.appPort}`);
+        printVerbose(`NocoBase app is starting at http://127.0.0.1:${plan.appPort}`);
         return plan;
     }
     static pushDownloadArgIfValue(argv, flag, value) {
@@ -1666,6 +1689,9 @@ export default class Install extends Command {
     }
     static buildDownloadArgvFromResults(results, options) {
         const argv = ['-y', '--no-intro'];
+        if (options?.compactLog) {
+            argv.push('--compact-log');
+        }
         const source = String(results.source ?? '').trim();
         if (options?.verbose) {
             argv.push('--verbose');
@@ -1718,11 +1744,8 @@ export default class Install extends Command {
     async downloadManagedSource(params) {
         const argv = Install.buildDownloadArgvFromResults(params.downloadResults, {
             verbose: params.verbose,
+            compactLog: true,
         });
-        const source = String(params.downloadResults.source ?? '').trim();
-        p.log.step(source === 'docker'
-            ? 'Downloading Docker image'
-            : 'Downloading local NocoBase app files');
         return await this.config.runCommand('source:download', argv);
     }
     async downloadLocalApp(params) {
@@ -1784,7 +1807,7 @@ export default class Install extends Command {
             rootResults: params.rootResults,
         });
         const args = ['start', '--quickstart', '--daemon'];
-        p.log.step(`Stopping any existing local NocoBase process in ${params.projectRoot}`);
+        this.logDetail(`Stopping any existing local NocoBase process in ${params.projectRoot}`);
         try {
             await runNocoBaseCommand(['pm2', 'kill'], {
                 cwd: params.projectRoot,
@@ -1794,15 +1817,15 @@ export default class Install extends Command {
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            p.log.info(`Skipped local process cleanup before start: ${message}`);
+            this.logDetail(`Skipped local process cleanup before start: ${message}`);
         }
-        p.log.step(`Starting local NocoBase app from ${params.projectRoot}`);
+        this.logDetail(`Starting local NocoBase app from ${params.projectRoot}`);
         await runNocoBaseCommand(args, {
             cwd: params.projectRoot,
             env,
             stdio: params.commandStdio ?? 'ignore',
         });
-        p.log.info(`Local app is starting at http://127.0.0.1:${env.APP_PORT}`);
+        this.logDetail(`Local app is starting at http://127.0.0.1:${env.APP_PORT}`);
         return {
             source: params.source,
             projectRoot: params.projectRoot,
@@ -1876,35 +1899,29 @@ export default class Install extends Command {
         const fetchImpl = options?.fetchImpl ?? fetch;
         const startedAt = Date.now();
         let lastMessage = 'No response yet';
-        let taskActive = true;
-        startTask(`Waiting for application health check: ${healthCheckUrl}. NocoBase has started and is still booting...`);
-        try {
-            while (Date.now() - startedAt < timeoutMs) {
-                const result = await Install.requestAppHealthCheck({
-                    healthCheckUrl,
-                    fetchImpl,
-                    requestTimeoutMs,
-                });
-                if (result.ok) {
-                    stopTask();
-                    taskActive = false;
-                    p.log.info(`Application health check passed: ${healthCheckUrl}`);
-                    return;
-                }
-                lastMessage = result.message;
-                const elapsedSeconds = Math.max(1, Math.floor((Date.now() - startedAt) / 1000));
-                updateTask(`Waiting for application health check: ${healthCheckUrl}. Still starting... (${elapsedSeconds}s elapsed, last status: ${Install.formatHealthCheckMessage(lastMessage)})`);
-                const remainingMs = timeoutMs - (Date.now() - startedAt);
-                if (remainingMs <= 0) {
-                    break;
-                }
-                await Install.sleep(Math.min(intervalMs, remainingMs));
+        let lastLoggedStatus = '';
+        printInfo('Waiting for NocoBase to become ready...');
+        while (Date.now() - startedAt < timeoutMs) {
+            const result = await Install.requestAppHealthCheck({
+                healthCheckUrl,
+                fetchImpl,
+                requestTimeoutMs,
+            });
+            if (result.ok) {
+                return;
             }
-        }
-        finally {
-            if (taskActive) {
-                stopTask();
+            lastMessage = result.message;
+            const elapsedSeconds = Math.max(1, Math.floor((Date.now() - startedAt) / 1000));
+            const statusLine = `Waiting for NocoBase to become ready... (${elapsedSeconds}s elapsed, last status: ${Install.formatHealthCheckMessage(lastMessage)})`;
+            if (statusLine !== lastLoggedStatus) {
+                printInfo(statusLine);
+                lastLoggedStatus = statusLine;
+            }
+            const remainingMs = timeoutMs - (Date.now() - startedAt);
+            if (remainingMs <= 0) {
+                break;
             }
+            await Install.sleep(Math.min(intervalMs, remainingMs));
         }
         const logHint = options?.containerName
             ? ` You can inspect startup logs with: docker logs ${options.containerName}`
@@ -1931,6 +1948,7 @@ export default class Install extends Command {
             || DEFAULT_INSTALL_APP_PORT;
         const storagePath = String(params.appResults.storagePath ?? '').trim()
             || defaultInstallStoragePath(params.envName);
+        const envFile = String(params.appResults.envFile ?? '').trim() || undefined;
         const apiBaseUrl = Install.resolveApiBaseUrl({
             appResults: params.appResults,
             envAddResults: params.envAddResults,
@@ -1953,6 +1971,7 @@ export default class Install extends Command {
             appRootPath: params.appResults.appRootPath,
             appPort,
             storagePath,
+            ...(envFile ? { envFile } : {}),
             appKey: params.appResults.appKey,
             timezone: params.appResults.timeZone,
             builtinDb: params.dbResults.builtinDb,
@@ -2049,7 +2068,14 @@ export default class Install extends Command {
             },
             yes,
         });
-        const envAddResults = await runPromptCatalog(EnvAdd.prompts, {
+        const envAddPromptsForInstall = {
+            ...EnvAdd.prompts,
+            apiBaseUrl: {
+                ...EnvAdd.prompts.apiBaseUrl,
+                validate: undefined,
+            },
+        };
+        const envAddResults = await runPromptCatalog(envAddPromptsForInstall, {
             initialValues: {
                 apiBaseUrl: `http://127.0.0.1:${appResults.appPort ?? DEFAULT_INSTALL_APP_PORT}/api`,
             },
@@ -2077,13 +2103,14 @@ export default class Install extends Command {
         const parsed = {
             ...flags,
         };
+        setVerboseMode(Boolean(parsed.verbose));
         const commandStdio = this.commandStdio(parsed.verbose);
         if (!parsed['no-intro']) {
-            p.intro('Set Up NocoBase');
+            this.logStage('Set up NocoBase');
         }
         if (parsed.resume) {
             const envLabel = Install.toOptionalPromptString(parsed.env);
-            p.log.step(envLabel
+            printInfo(envLabel
                 ? `Resuming setup for env "${envLabel}" from the saved workspace config`
                 : 'Resuming setup from the saved workspace config');
         }
@@ -2100,6 +2127,9 @@ export default class Install extends Command {
             : undefined;
         await Install.ensureExternalDbReadyForInstall(dbResults);
         if (!parsed.resume) {
+            if (!parsed['skip-save-env-log']) {
+                this.logStage('Saving env config');
+            }
             await this.saveInstalledEnv({
                 envName,
                 appResults,
@@ -2108,7 +2138,9 @@ export default class Install extends Command {
                 rootResults,
                 envAddResults,
             });
-            p.log.info(`Saved install config for env "${envName}"`);
+            if (!parsed['skip-save-env-log']) {
+                printInfo(`Saved env config for "${envName}".`);
+            }
         }
         let builtinDbPlan;
         if (Boolean(dbResults.builtinDb)) {
@@ -2132,11 +2164,13 @@ export default class Install extends Command {
         let dockerAppPlan;
         let localAppPlan;
         if (Boolean(appResults.fetchSource)) {
+            this.logStage('Preparing application');
             if (source === 'docker') {
                 await this.downloadManagedSource({
                     downloadResults,
                     verbose: parsed.verbose,
                 });
+                printInfo('Application image ready.');
                 dockerAppPlan = await this.installDockerApp({
                     envName,
                     dockerNetworkName,
@@ -2160,6 +2194,7 @@ export default class Install extends Command {
                     downloadResults,
                     verbose: parsed.verbose,
                 });
+                printInfo('Application files ready.');
                 localAppPlan = await this.startLocalApp({
                     envName,
                     source: localSource,
@@ -2174,15 +2209,17 @@ export default class Install extends Command {
             }
         }
         else {
-            p.log.info('Skipped app download and install.');
+            this.logDetail('Skipped app download and install.');
         }
         if (dockerAppPlan || localAppPlan) {
+            this.logStage('Starting NocoBase');
             await this.waitForAppHealthCheck(Install.resolveApiBaseUrl({
                 appResults,
                 envAddResults,
             }), {
                 containerName: dockerAppPlan?.containerName,
             });
+            printInfo(`NocoBase is ready at http://127.0.0.1:${dockerAppPlan?.appPort ?? localAppPlan?.appPort}`);
         }
         if (dockerAppPlan || localAppPlan || builtinDbPlan) {
             await this.saveInstalledEnv({
@@ -2199,9 +2236,9 @@ export default class Install extends Command {
             envAddResults,
             appReady: Boolean(dockerAppPlan || localAppPlan),
         });
-        p.outro(dockerAppPlan || localAppPlan
-            ? `NocoBase is ready at http://127.0.0.1:${dockerAppPlan?.appPort ?? localAppPlan?.appPort}`
-            : `Install config for "${envName}" has been saved.`);
+        if (!dockerAppPlan && !localAppPlan) {
+            printInfo(`Install config for "${envName}" has been saved.`);
+        }
     }
 }
 function downloadResultsValue(downloadResults, key) {