@nocobase/cli 2.1.0-beta.46 → 2.1.0-beta.48

package/bin/run.js

@@ -79,6 +79,7 @@ const cliEntryErrorPath = isDev
   : path.join(root, 'dist/lib/cli-entry-error.js');
 const { appendDiagnosticLogPath, formatCliEntryError } = await import(pathToFileURL(cliEntryErrorPath).href);
 const { flush, run, settings } = await import('@oclif/core');
+const forcedColors = pc.createColors(true);
 
 if (isDev) {
   settings.debug = true;
@@ -138,7 +139,7 @@ try {
     formatCliEntryError(error, process.argv.slice(2)),
     commandLogSession?.logFile,
   );
-  console.error(pc.red(message));
+  console.error(forcedColors.red(message));
   finalizeCommandLogOnce({ exitCode: 1, errorMessage: message });
   process.exit(1);
 }

package/dist/commands/app/destroy.js

@@ -53,7 +53,7 @@ function buildDestroyPrompt(runtime, options) {
         if (options.removesManagedLocalAppFiles) {
             lines.push('CLI-managed local app files will also be removed.');
         }
-        lines.push('Env-specific proxy entry files generated by `nb env proxy` will also be removed when present.');
+        lines.push('Env-specific proxy entry files generated by `nb proxy` will also be removed when present.');
         if (options.removesStorageData) {
             lines.push('Storage data will be removed.');
         }
@@ -204,11 +204,11 @@ export default class AppDestroy extends Command {
                     resolveEnvProxyEntryDir(runtime.envName, { provider: 'caddy' }),
                     path.dirname(resolveLegacyNginxEnvProxyAppOutputPath(runtime.envName)),
                 ];
-                startTask(`Removing env proxy entry files for "${runtime.envName}"...`);
+                startTask(`Removing proxy entry files for "${runtime.envName}"...`);
                 for (const proxyEntryDir of proxyEntryDirs) {
                     await removePathIfExists(proxyEntryDir, `proxy entry files for "${runtime.envName}"`);
                 }
-                succeedTask(`Env proxy entry files removed for "${runtime.envName}".`);
+                succeedTask(`Proxy entry files removed for "${runtime.envName}".`);
                 const configuredStoragePath = resolveConfiguredStoragePath(runtime.env.config);
                 if (configuredStoragePath) {
                     startTask(`Removing storage data for "${runtime.envName}"...`);

package/dist/commands/app/restart.js

@@ -68,8 +68,6 @@ export default class AppRestart extends Command {
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --env local',
-        '<%= config.bin %> <%= command.id %> --env local --daemon',
-        '<%= config.bin %> <%= command.id %> --env local --no-daemon',
         '<%= config.bin %> <%= command.id %> --env local --verbose',
         '<%= config.bin %> <%= command.id %> --env local-docker',
     ];
@@ -98,6 +96,7 @@ export default class AppRestart extends Command {
             allowNo: true,
         }),
         daemon: Flags.boolean({
+            hidden: true,
             description: 'Run the application as a daemon after stopping it (default: true; use --no-daemon to stay in the foreground)',
             char: 'd',
             required: false,

package/dist/commands/app/start.js

@@ -12,6 +12,8 @@ import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-
 import { formatMissingManagedAppEnvMessage, managedAppLifecycleEnvVars, resolveManagedAppRuntime, runLocalNocoBaseCommand, } from '../../lib/app-runtime.js';
 import { AppHealthCheckError, formatAppUrl, isAppReady, resolveManagedAppApiBaseUrl, waitForAppReady, } from '../../lib/app-health.js';
 import { ensureBuiltinDbReady, ensureLocalPostinstall, ensureSavedLocalSource, recreateSavedDockerApp, } from '../../lib/app-managed-resources.js';
+import { clearEnvRootSetup, getEnv, upsertEnv } from '../../lib/auth-store.js';
+import { buildInitAppEnvVarsFromConfig, isPreparedSetupState } from '../../lib/managed-init-env.js';
 import { resolveAppUrlFromApiBaseUrl } from '../env/shared.js';
 import { readManagedRuntimeEnvValues } from '../../lib/managed-env-file.js';
 import { run } from '../../lib/run-npm.js';
@@ -116,14 +118,20 @@ async function resolveDefaultLocalCdnBaseUrl(runtime) {
     }
     return buildDefaultCdnBaseUrl(runtime.env.config?.appPublicPath || envValues.APP_PUBLIC_PATH, activeVersion);
 }
+async function finalizePreparedEnv(envName) {
+    const existingEnv = await getEnv(envName);
+    await clearEnvRootSetup(envName);
+    await upsertEnv(envName, {
+        ...(existingEnv?.config.apiBaseUrl ? { apiBaseUrl: existingEnv.config.apiBaseUrl } : {}),
+        setupState: 'installed',
+    });
+}
 export default class AppStart extends Command {
     static hidden = false;
     static description = 'Start NocoBase for the selected env. When applicable, the CLI synchronizes licensed commercial plugins first, then prepares and starts the app or recreates the saved Docker container.';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --env local',
-        '<%= config.bin %> <%= command.id %> --env local --daemon',
-        '<%= config.bin %> <%= command.id %> --env local --no-daemon',
         '<%= config.bin %> <%= command.id %> --env local --verbose',
         '<%= config.bin %> <%= command.id %> --env local-docker',
     ];
@@ -152,6 +160,7 @@ export default class AppStart extends Command {
             allowNo: true,
         }),
         daemon: Flags.boolean({
+            hidden: true,
             description: 'Run the application as a daemon (default: true; use --no-daemon to stay in the foreground)',
             char: 'd',
             required: false,
@@ -181,6 +190,8 @@ export default class AppStart extends Command {
         }
         const daemonFlagWasProvided = argvHasToken(this.argv, ['--daemon', '--no-daemon']);
         const runtime = await resolveManagedAppRuntime(requestedEnv);
+        const preparedInitEnvVars = buildInitAppEnvVarsFromConfig(runtime?.env.config);
+        const isPreparedEnv = isPreparedSetupState(runtime?.env.config?.setupState);
         const runCommand = this.config.runCommand.bind(this.config);
         const commandStdio = flags.verbose ? 'inherit' : 'ignore';
         if (!runtime) {
@@ -239,6 +250,7 @@ export default class AppStart extends Command {
                     stdio: commandStdio,
                 }).catch(() => undefined);
                 await recreateSavedDockerApp(runtime, {
+                    initEnvVars: isPreparedEnv ? preparedInitEnvVars : undefined,
                     verbose: flags.verbose,
                 });
                 succeedTask(`Docker app container is ready for "${runtime.envName}".`);
@@ -255,6 +267,9 @@ export default class AppStart extends Command {
                 logHint: `You can inspect startup logs with \`nb app logs --env ${runtime.envName}\`.`,
                 ...(flags.verbose ? { verbose: true } : {}),
             });
+            if (isPreparedEnv) {
+                await finalizePreparedEnv(runtime.envName);
+            }
             if (shouldPrintStartSuccess()) {
                 succeedTask(`NocoBase is running for "${runtime.envName}"${appUrl ? ` at ${appUrl}` : ''}.`);
             }
@@ -275,6 +290,9 @@ export default class AppStart extends Command {
                 onFailTask: failTask,
             });
         }
+        if (isPreparedEnv && flags.daemon === false) {
+            this.error(`Can't start "${runtime.envName}" with --no-daemon yet. Run \`nb app start --env ${runtime.envName}\` to finish the first installation in daemon mode.`);
+        }
         const npmArgs = ['start'];
         if (quickstart) {
             npmArgs.push('--quickstart');
@@ -357,8 +375,12 @@ export default class AppStart extends Command {
                 ? {
                     ...managedAppLifecycleEnvVars(),
                     CDN_BASE_URL: defaultCdnBaseUrl,
+                    ...(isPreparedEnv ? preparedInitEnvVars : {}),
                 }
-                : managedAppLifecycleEnvVars();
+                : {
+                    ...managedAppLifecycleEnvVars(),
+                    ...(isPreparedEnv ? preparedInitEnvVars : {}),
+                };
             await runLocalNocoBaseCommand(runtime, npmArgs, {
                 env: startEnv,
                 stdio: commandStdio,
@@ -369,6 +391,9 @@ export default class AppStart extends Command {
                     apiBaseUrl,
                     logHint: `You can inspect startup logs with \`nb app logs --env ${runtime.envName}\`.`,
                 });
+                if (isPreparedEnv) {
+                    await finalizePreparedEnv(runtime.envName);
+                }
                 if (shouldPrintStartSuccess()) {
                     succeedTask(`NocoBase is running for "${runtime.envName}"${appUrl ? ` at ${appUrl}` : ''}.`);
                 }

package/dist/commands/app/upgrade.js

@@ -288,7 +288,7 @@ export default class AppUpgrade extends Command {
         }),
         verbose: Flags.boolean({
             description: 'Show raw output from the underlying local or Docker commands',
-            default: false,
+            default: true,
         }),
     };
     static resolveUpgradeVersion(runtime, flags) {

package/dist/commands/env/update.js

@@ -12,10 +12,16 @@ import { Args, Command, Flags } from '@oclif/core';
 import { getCurrentEnvName, getEnv, replaceEnvConfig } from '../../lib/auth-store.js';
 import { updateEnvRuntime } from '../../lib/bootstrap.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
+import { appendDiagnosticLogPath } from '../../lib/cli-entry-error.js';
+import { getActiveCommandLogFile } from '../../lib/command-log.js';
 import { ENV_BOOLEAN_CONFIG_FLAG_MAP, ENV_STRING_CONFIG_FLAG_MAP } from '../../lib/env-command-config.js';
 import { buildStoredEnvConfig } from '../../lib/env-config.js';
-import { failTask, printInfo, printVerbose, printWarningBlock, setVerboseMode, startTask, stopTask, succeedTask } from '../../lib/ui.js';
+import { validateApiBaseUrl } from '../../lib/prompt-validators.js';
+import { failTask, printInfo, printVerbose, printWarningBlock, setVerboseMode, startTask, stopTask, succeedTask, } from '../../lib/ui.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
+function throwValidationError(message) {
+    throw new Error(appendDiagnosticLogPath(message, getActiveCommandLogFile()));
+}
 const UPDATE_STRING_FLAGS = [
     'source',
     'download-version',
@@ -384,6 +390,10 @@ export default class EnvUpdate extends Command {
         nextInput.authType = currentEnv.authType;
         nextInput.authUsername = currentEnv.config.authUsername;
         if (parsedFlags['api-base-url'] !== undefined) {
+            const apiBaseUrlValidationError = await validateApiBaseUrl(parsedFlags['api-base-url']);
+            if (apiBaseUrlValidationError) {
+                throwValidationError(apiBaseUrlValidationError);
+            }
             nextInput.apiBaseUrl = parsedFlags['api-base-url'];
         }
         if (parsedFlags['auth-type'] !== undefined) {

package/dist/commands/init.js

@@ -18,6 +18,7 @@ import { applyCliLocale, localeText, translateCli } from "../lib/cli-locale.js";
 import { resolveDefaultConfigScope } from '../lib/cli-home.js';
 import { resolveDefaultApiHost, resolveDefaultUiHost } from '../lib/cli-config.js';
 import { areConfiguredPathsEquivalent, deriveConfiguredSourcePath, deriveConfiguredStoragePath, inferConfiguredAppPathFromLegacyConfig, } from '../lib/env-paths.js';
+import { formatMissingManagedAppEnvMessage } from '../lib/app-runtime.js';
 import { runPromptCatalogWebUI } from "../lib/prompt-web-ui.js";
 import { validateApiBaseUrl, validateEnvKey } from "../lib/prompt-validators.js";
 import { installNocoBaseSkills, isNpmRegistryUnavailable } from '../lib/skills-manager.js';
@@ -467,7 +468,7 @@ Prompt modes:
         }),
         verbose: Flags.boolean({
             description: 'Show detailed command output',
-            default: false,
+            default: true,
         }),
         'skip-skills': Flags.boolean({
             description: 'Skip installing NocoBase AI coding skills during init',
@@ -482,7 +483,7 @@ Prompt modes:
             max: 65535,
         }),
         ...pickKeys(EnvAdd.flags, INIT_ENV_ADD_FLAG_NAMES),
-        ...omitKeys(Install.flags, ['yes', 'env']),
+        ...omitKeys(Install.flags, ['yes', 'env', 'verbose']),
     };
     async run() {
         const parsedResult = await this.parse(Init);
@@ -499,13 +500,13 @@ Prompt modes:
             (normalizedFlags['access-token'] !== undefined || normalizedFlags.token !== undefined)) {
             this.error('--skip-auth cannot be used with --access-token or --token.');
         }
-        if (normalizedFlags.ui && normalizedFlags.resume) {
-            this.error('--ui cannot be used with --resume.');
+        if (normalizedFlags['prepare-only'] && explicitSetupModeFlag(normalizedFlags) === 'connect-remote') {
+            this.error('--prepare-only is only available for local or install-new setup flows.');
         }
         if (!normalizedFlags.ui && (normalizedFlags['ui-host'] !== undefined || normalizedFlags['ui-port'] !== undefined)) {
             this.error('--ui-host and --ui-port require --ui.');
         }
-        if (normalizedFlags.resume) {
+        if (normalizedFlags.resume && !normalizedFlags.ui) {
             const envName = String(normalizedFlags.env ?? '').trim();
             if (!envName) {
                 this.error(formatResumeEnvRequiredMessage());
@@ -533,15 +534,26 @@ Prompt modes:
                 const resumeEnv = await getEnv(resumeEnvName, {
                     scope: resolveDefaultConfigScope(),
                 });
-                if (resumeEnv) {
-                    const savedAppPort = String(resumeEnv.config.appPort ?? '').trim();
-                    const savedDbPort = String(resumeEnv.config.dbPort ?? '').trim();
-                    if (savedAppPort) {
-                        presetValues.resumeSavedAppPort = savedAppPort;
-                    }
-                    if (savedDbPort) {
-                        presetValues.resumeSavedDbPort = savedDbPort;
-                    }
+                if (!resumeEnv) {
+                    this.error(formatMissingManagedAppEnvMessage(resumeEnvName));
+                }
+                const resumePresetValues = Install.buildResumePresetValues(resumeEnv);
+                presetValues = {
+                    ...resumePresetValues.envPreset,
+                    ...resumePresetValues.appPreset,
+                    ...resumePresetValues.downloadPreset,
+                    ...resumePresetValues.dbPreset,
+                    ...resumePresetValues.rootPreset,
+                    ...resumePresetValues.envAddPreset,
+                    ...presetValues,
+                };
+                const savedAppPort = String(resumeEnv.config.appPort ?? '').trim();
+                const savedDbPort = String(resumeEnv.config.dbPort ?? '').trim();
+                if (savedAppPort) {
+                    presetValues.resumeSavedAppPort = savedAppPort;
+                }
+                if (savedDbPort) {
+                    presetValues.resumeSavedDbPort = savedDbPort;
                 }
             }
         }
@@ -653,14 +665,14 @@ Prompt modes:
                 await this.persistManagedEnvConfig(normalizedResults, normalizedFlags);
                 managedInstallResults = normalizedResults;
                 printInfo(`Saved env config for "${String(normalizedResults.appName ?? DEFAULT_INIT_APP_NAME).trim() || DEFAULT_INIT_APP_NAME}".`);
-                printVerbose('Running nb init');
+                printVerbose('Running nb install');
                 await this.config.runCommand('install', this.buildInstallArgv(normalizedResults, normalizedFlags));
             }
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
             const formatted = managedInstallResults
-                ? this.formatManagedInstallFailureMessage(message, managedInstallResults, normalizedFlags)
+                ? await this.formatManagedInstallFailureMessage(message, managedInstallResults, normalizedFlags)
                 : message;
             this.error(pc.red(formatted));
             this.exit(1);
@@ -1068,6 +1080,8 @@ Prompt modes:
             ...(dbSchema ? { dbSchema } : {}),
             ...(dbTablePrefix ? { dbTablePrefix } : {}),
             ...(results.dbUnderscored !== undefined ? { dbUnderscored: Boolean(results.dbUnderscored) } : {}),
+            setupState: 'prepared',
+            ...(String(results.lang ?? '').trim() ? { lang: String(results.lang ?? '').trim() } : {}),
         }, { scope: resolveDefaultConfigScope() });
     }
     buildEnvAddArgv(results) {
@@ -1115,6 +1129,9 @@ Prompt modes:
         if (options?.resume) {
             argv.push('--resume');
         }
+        if (flags['prepare-only']) {
+            argv.push('--prepare-only');
+        }
         if (flags.verbose) {
             argv.push('--verbose');
         }
@@ -1291,72 +1308,23 @@ Prompt modes:
     }
     buildManagedInstallResumeCommand(results, flags) {
         const argv = ['nb', 'init'];
-        if (flags.yes) {
-            argv.push('--yes');
-        }
         const envName = String(results.appName ?? DEFAULT_INIT_APP_NAME).trim() || DEFAULT_INIT_APP_NAME;
         argv.push('--env', envName);
-        const setupMode = resolveInitSetupMode(results);
-        if (setupMode === 'manage-local') {
-            argv.push('--setup-mode', 'manage-local');
-        }
-        const source = String(results.source ?? '').trim();
-        const skipDownload = setupMode === 'manage-local' ? false : Boolean(flags['skip-download']) || results.skipDownload === true;
-        if (source) {
-            argv.push('--source', source);
-        }
-        const version = resolveInitDownloadVersion(results);
-        if (version) {
-            argv.push('--version', version);
-        }
-        const gitUrl = String(results.gitUrl ?? '').trim();
-        if (gitUrl) {
-            argv.push('--git-url', gitUrl);
-        }
-        const dockerRegistry = String(results.dockerRegistry ?? '').trim();
-        if (dockerRegistry) {
-            argv.push('--docker-registry', dockerRegistry);
-        }
-        const dockerPlatform = String(results.dockerPlatform ?? '').trim();
-        if (dockerPlatform) {
-            argv.push('--docker-platform', dockerPlatform);
-        }
-        const npmRegistry = String(results.npmRegistry ?? '').trim();
-        if (npmRegistry) {
-            argv.push('--npm-registry', npmRegistry);
-        }
-        if (skipDownload) {
-            argv.push('--skip-download');
+        if (flags.yes) {
+            argv.push('--yes');
         }
-        else {
-            const outputDir = String(results.outputDir ?? '').trim();
-            const appPath = String(results.appPath ?? '').trim() ||
-                inferConfiguredAppPathFromLegacyConfig({
-                    appRootPath: results.appRootPath,
-                    storagePath: results.storagePath,
-                }) ||
-                '';
-            const expectedOutputDir = String(results.appRootPath ?? '').trim() || (appPath ? deriveConfiguredSourcePath(appPath) : '');
-            if (outputDir && outputDir !== expectedOutputDir) {
-                argv.push('--output-dir', outputDir);
-            }
-            if (results.devDependencies) {
-                argv.push('--dev-dependencies');
-            }
-            if (results.dockerSave) {
-                argv.push('--docker-save');
-            }
-            if (results.build !== undefined && !results.build) {
-                argv.push('--no-build');
-            }
-            if (results.buildDts) {
-                argv.push('--build-dts');
-            }
+        if (flags.ui) {
+            argv.push('--ui');
         }
-        argv.push('--resume', '--verbose');
+        argv.push('--resume');
         return argv.map(shellQuoteArg).join(' ');
     }
-    formatManagedInstallFailureMessage(message, results, flags) {
+    async formatManagedInstallFailureMessage(message, results, flags) {
+        const envName = String(results.appName ?? DEFAULT_INIT_APP_NAME).trim() || DEFAULT_INIT_APP_NAME;
+        const savedEnv = await getEnv(envName, { scope: resolveDefaultConfigScope() });
+        if (savedEnv?.config.setupState === 'installed') {
+            return message;
+        }
         const command = this.buildManagedInstallResumeCommand(results, flags);
         return [message, '', translateCli('commands.init.messages.resumeAfterInstallFailure', { command })].join('\n');
     }

package/dist/commands/install.js

@@ -28,6 +28,7 @@ import { clearEnvRootSetup, getEnv, setCurrentEnv, upsertEnv } from '../lib/auth
 import { buildStoredEnvConfig } from '../lib/env-config.js';
 import { resolveDockerEnvFileArg } from "../lib/docker-env-file.js";
 import { startDockerLogFollower } from '../lib/docker-log-stream.js';
+import { buildInitAppEnvVarsFromConfig } from '../lib/managed-init-env.js';
 import { areConfiguredPathsEquivalent, deriveConfiguredSourcePath, deriveConfiguredStoragePath, inferConfiguredAppPathFromLegacyConfig, } from '../lib/env-paths.js';
 import Download, { defaultDockerRegistryForLang } from './download.js';
 import EnvAdd from "./env/add.js";
@@ -351,6 +352,10 @@ export default class Install extends Command {
             hidden: true,
             default: false,
         }),
+        'prepare-only': Flags.boolean({
+            description: 'Prepare the env and save config without installing or starting the application yet',
+            default: false,
+        }),
         env: Flags.string({
             char: 'e',
             description: 'App/env name to create or update. Defaults the app path to ./<envName>/ and derives source/storage inside it.',
@@ -1110,9 +1115,11 @@ export default class Install extends Command {
         const rootEmail = Install.toOptionalPromptString(config.rootEmail);
         const rootPassword = Install.toOptionalPromptString(config.rootPassword);
         const rootNickname = Install.toOptionalPromptString(config.rootNickname);
+        const lang = Install.toOptionalPromptString(config.lang);
         const auth = config.auth;
         const savedAuthType = Install.toOptionalPromptString(config.authType) ?? Install.toOptionalPromptString(auth?.type);
         const appPreset = {
+            ...(lang ? { lang } : {}),
             ...(appPath ? { appPath } : {}),
             ...(appRootPath ? { appRootPath } : {}),
             ...(appPort ? { appPort } : {}),
@@ -1185,21 +1192,25 @@ export default class Install extends Command {
             envAddPreset,
         };
     }
-    static buildResumeMissingYesFlags(flags) {
+    static buildResumeMissingYesFlags(flags, resumePreset) {
         const missing = [];
-        if (!Install.toOptionalPromptString(flags.lang)) {
+        if (!Install.toOptionalPromptString(flags.lang) && !Install.toOptionalPromptString(resumePreset.appPreset.lang)) {
             missing.push('--lang');
         }
-        if (!Install.toOptionalPromptString(flags['root-username'])) {
+        if (!Install.toOptionalPromptString(flags['root-username']) &&
+            !Install.toOptionalPromptString(resumePreset.rootPreset.rootUsername)) {
             missing.push('--root-username');
         }
-        if (!Install.toOptionalPromptString(flags['root-email'])) {
+        if (!Install.toOptionalPromptString(flags['root-email']) &&
+            !Install.toOptionalPromptString(resumePreset.rootPreset.rootEmail)) {
             missing.push('--root-email');
         }
-        if (!Install.toOptionalPromptString(flags['root-password'])) {
+        if (!Install.toOptionalPromptString(flags['root-password']) &&
+            !Install.toOptionalPromptString(resumePreset.rootPreset.rootPassword)) {
             missing.push('--root-password');
         }
-        if (!Install.toOptionalPromptString(flags['root-nickname'])) {
+        if (!Install.toOptionalPromptString(flags['root-nickname']) &&
+            !Install.toOptionalPromptString(resumePreset.rootPreset.rootNickname)) {
             missing.push('--root-nickname');
         }
         return missing;
@@ -1212,8 +1223,9 @@ export default class Install extends Command {
         if (!env) {
             throw new Error(formatMissingManagedAppEnvMessage(parsed.env));
         }
+        const resumePreset = Install.buildResumePresetValues(env);
         if (yes) {
-            const missingFlags = Install.buildResumeMissingYesFlags(parsed);
+            const missingFlags = Install.buildResumeMissingYesFlags(parsed, resumePreset);
             if (missingFlags.length > 0) {
                 throw new Error([
                     `Cannot continue setup for "${env.name}" in non-interactive resume mode yet.`,
@@ -1222,7 +1234,7 @@ export default class Install extends Command {
                 ].join('\n'));
             }
         }
-        return Install.buildResumePresetValues(env);
+        return resumePreset;
     }
     static async resolveAvailableDefaultPort(defaultPort, options) {
         const normalized = String(defaultPort).trim();
@@ -1374,7 +1386,7 @@ export default class Install extends Command {
         if (argvHasToken(argv, ['--build-dts', '--no-build-dts'])) {
             preset.buildDts = flags['build-dts'];
         }
-        if (yes) {
+        if (yes && !flags.resume) {
             preset.source ??= 'docker';
             preset.version ??= 'alpha';
             preset.outputDir ??= appRoot;
@@ -1415,20 +1427,13 @@ export default class Install extends Command {
         return Install.sanitizeDockerResourceName(`${Install.buildBuiltinDbContainerPrefix(containerPrefix)}-${envName}-app`);
     }
     static buildInitAppEnvVars(params) {
-        const out = {};
-        const put = (key, value) => {
-            const text = String(value ?? '').trim();
-            if (!text) {
-                return;
-            }
-            out[key] = text;
-        };
-        put('INIT_APP_LANG', params.appResults.lang);
-        put('INIT_ROOT_USERNAME', params.rootResults.rootUsername);
-        put('INIT_ROOT_EMAIL', params.rootResults.rootEmail);
-        put('INIT_ROOT_PASSWORD', params.rootResults.rootPassword);
-        put('INIT_ROOT_NICKNAME', params.rootResults.rootNickname);
-        return out;
+        return buildInitAppEnvVarsFromConfig({
+            lang: String(params.appResults.lang ?? ''),
+            rootUsername: String(params.rootResults.rootUsername ?? ''),
+            rootEmail: String(params.rootResults.rootEmail ?? ''),
+            rootPassword: String(params.rootResults.rootPassword ?? ''),
+            rootNickname: String(params.rootResults.rootNickname ?? ''),
+        });
     }
     static shouldPublishBuiltinDbPort(source) {
         return String(source ?? '').trim() !== 'docker';
@@ -2232,6 +2237,7 @@ export default class Install extends Command {
             authType,
             ...(authUsername ? { authUsername } : {}),
             accessToken: params.envAddResults.accessToken,
+            setupState: params.appResults.setupState,
             source: downloadResultsValue(params.downloadResults, 'source'),
             downloadVersion: downloadResultsValue(params.downloadResults, 'version'),
             dockerRegistry: downloadResultsValue(params.downloadResults, 'dockerRegistry'),
@@ -2247,6 +2253,7 @@ export default class Install extends Command {
             ...(storagePath && !areConfiguredPathsEquivalent(storagePath, derivedStoragePath) ? { storagePath } : {}),
             ...(appPublicPath ? { appPublicPath } : {}),
             ...(envFile ? { envFile } : {}),
+            lang: params.appResults.lang,
             appKey: params.appResults.appKey,
             timezone: params.appResults.timeZone,
             builtinDb: params.dbResults.builtinDb,
@@ -2432,6 +2439,7 @@ export default class Install extends Command {
             envName,
             appResults,
         });
+        appResults.setupState = 'prepared';
         const source = String(downloadResultsValue(downloadResults, 'source') ?? '').trim();
         const usesDockerResources = Boolean(dbResults.builtinDb) || source === 'docker';
         const dockerNetworkName = usesDockerResources
@@ -2496,20 +2504,22 @@ export default class Install extends Command {
                     });
                     printInfo('Application image ready.');
                 }
-                dockerAppPlan = await this.installDockerApp({
-                    envName,
-                    dockerNetworkName,
-                    dockerContainerPrefix,
-                    appResults,
-                    downloadResults,
-                    dbResults,
-                    rootResults,
-                    builtinDbPlan,
-                    force: parsed.force,
-                    commandStdio,
-                });
-                appResults.appKey = dockerAppPlan.appKey;
-                appResults.timeZone = dockerAppPlan.timeZone;
+                if (!parsed['prepare-only']) {
+                    dockerAppPlan = await this.installDockerApp({
+                        envName,
+                        dockerNetworkName,
+                        dockerContainerPrefix,
+                        appResults,
+                        downloadResults,
+                        dbResults,
+                        rootResults,
+                        builtinDbPlan,
+                        force: parsed.force,
+                        commandStdio,
+                    });
+                    appResults.appKey = dockerAppPlan.appKey;
+                    appResults.timeZone = dockerAppPlan.timeZone;
+                }
             }
             else if (source === 'npm' || source === 'git') {
                 const localSource = source === 'npm' ? 'npm' : 'git';
@@ -2528,17 +2538,19 @@ export default class Install extends Command {
                 if (!parsed['skip-download']) {
                     printInfo('Application files ready.');
                 }
-                localAppPlan = await this.startLocalApp({
-                    envName,
-                    source: localSource,
-                    projectRoot,
-                    appResults,
-                    dbResults,
-                    rootResults,
-                    commandStdio,
-                });
-                appResults.appKey = localAppPlan.appKey;
-                appResults.timeZone = localAppPlan.timeZone;
+                if (!parsed['prepare-only']) {
+                    localAppPlan = await this.startLocalApp({
+                        envName,
+                        source: localSource,
+                        projectRoot,
+                        appResults,
+                        dbResults,
+                        rootResults,
+                        commandStdio,
+                    });
+                    appResults.appKey = localAppPlan.appKey;
+                    appResults.timeZone = localAppPlan.timeZone;
+                }
             }
         }
         else {
@@ -2560,6 +2572,7 @@ export default class Install extends Command {
                 defaultApiHost,
             });
             printInfo(`NocoBase is ready at ${formatInstallDisplayUrl(displayApiBaseUrl)}`);
+            appResults.setupState = 'installed';
         }
         if (dockerAppPlan || localAppPlan || builtinDbPlan) {
             await this.saveInstalledEnv({
@@ -2577,8 +2590,13 @@ export default class Install extends Command {
             appReady: Boolean(dockerAppPlan || localAppPlan),
             skipAuth: Boolean(parsed['skip-auth']),
         });
-        await clearEnvRootSetup(envName, { scope: resolveDefaultConfigScope() });
-        if (!dockerAppPlan && !localAppPlan) {
+        if (!parsed['prepare-only']) {
+            await clearEnvRootSetup(envName, { scope: resolveDefaultConfigScope() });
+        }
+        if (parsed['prepare-only']) {
+            printInfo(`Preparation complete for "${envName}". Activate the license, then run \`nb app start --env ${envName}\`.`);
+        }
+        else if (!dockerAppPlan && !localAppPlan) {
             printInfo(`Install config for "${envName}" has been saved.`);
         }
     }

package/dist/commands/license/activate.js

@@ -174,6 +174,6 @@ export default class LicenseActivate extends Command {
             this.error(licenseActivateText('errors.activationFailed', { envName: runtime.envName, reason }));
         }
         this.log(licenseActivateText('messages.activated', { envName: runtime.envName }));
-        this.log(licenseActivateText('messages.savedLicenseKey', { licenseKeyPath }));
+        this.log(licenseActivateText('messages.savedLicenseKey'));
     }
 }

package/dist/commands/proxy/caddy/current.js

@@ -0,0 +1,17 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * 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 { Command } from '@oclif/core';
+import { getCaddyProxyDriver } from '../../../lib/proxy-caddy.js';
+export default class ProxyCaddyCurrent extends Command {
+    static summary = 'Print the current caddy runtime driver';
+    async run() {
+        await this.parse(ProxyCaddyCurrent);
+        this.log(await getCaddyProxyDriver());
+    }
+}