@nocobase/cli 2.1.0-beta.20 → 2.1.0-beta.22

package/dist/commands/install.js

@@ -16,11 +16,13 @@ import path from 'node:path';
 import { exit } from 'node:process';
 import { runPromptCatalog, } from "../lib/prompt-catalog.js";
 import { applyCliLocale, localeText, resolveCliLocale, translateCli, } from "../lib/cli-locale.js";
+import { resolveConfiguredEnvPath, resolveDefaultConfigScope, resolveEnvRoot, resolveEnvRelativePath, } from '../lib/cli-home.js';
 import { findAvailableTcpPort, validateAvailableTcpPort, validateTcpPort, validateEnvKey, } from "../lib/prompt-validators.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 { ensureWorkspaceName, getEnv } from '../lib/auth-store.js';
+import { ensureWorkspaceName, getEnv, loadAuthConfig, upsertEnv } from '../lib/auth-store.js';
+import { buildStoredEnvConfig } from '../lib/env-config.js';
 import Download, { defaultDockerRegistryForLang, } from './download.js';
 import EnvAdd from "./env/add.js";
 const DEFAULT_INSTALL_ENV_NAME = 'local';
@@ -53,7 +55,6 @@ const DEFAULT_INSTALL_ROOT_USERNAME = 'nocobase';
 const DEFAULT_INSTALL_ROOT_EMAIL = 'admin@nocobase.com';
 const DEFAULT_INSTALL_ROOT_PASSWORD = 'admin123';
 const DEFAULT_INSTALL_ROOT_NICKNAME = 'Super Admin';
-const CONFIG_SCOPE = 'project';
 const APP_HEALTH_CHECK_INTERVAL_MS = 2_000;
 const APP_HEALTH_CHECK_TIMEOUT_MS = 600_000;
 const APP_HEALTH_CHECK_REQUEST_TIMEOUT_MS = 5_000;
@@ -137,6 +138,11 @@ function argvHasToken(argv, tokens) {
 function isInstallDbDialect(value) {
     return INSTALL_DB_DIALECTS.includes(value);
 }
+function downloadVersionPromptValue(version) {
+    return version === 'latest' || version === 'beta' || version === 'alpha'
+        ? version
+        : 'other';
+}
 function supportsBuiltinDbDialect(value) {
     const dialect = String(value ?? '').trim();
     return Object.prototype.hasOwnProperty.call(DEFAULT_INSTALL_BUILTIN_DB_IMAGES, dialect);
@@ -240,7 +246,8 @@ async function commandOutput(command, args, options) {
     });
 }
 export default class Install extends Command {
-    static description = 'Install NocoBase: database, storage, admin user, and `nocobase-v1 install`. Optionally run `nb download` first; distribution and image details are configured on `nb download`, not here. Use `--resume` to continue an interrupted setup from the saved workspace env config.';
+    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 = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --env app1',
@@ -271,6 +278,25 @@ export default class Install extends Command {
             char: 'e',
             description: 'App/env name to create or update. Defaults app paths to ./<envName>/source/ and ./<envName>/storage/.',
         }),
+        'default-api-base-url': Flags.string({
+            char: 'd',
+            hidden: true,
+            description: 'Default API base URL for HTTP API calls, including the /api prefix (e.g. http://localhost:13000/api)',
+        }),
+        'api-base-url': Flags.string({
+            char: 'u',
+            description: 'Root URL for HTTP API calls, including the /api prefix (e.g. http://localhost:13000/api)',
+        }),
+        'auth-type': Flags.string({
+            char: 'a',
+            description: 'Authentication: token (API key) or oauth (browser login via `nb env auth`)',
+            options: ['token', 'oauth'],
+        }),
+        'access-token': Flags.string({
+            char: 't',
+            aliases: ['token'],
+            description: 'API key or access token when using --auth-type token',
+        }),
         lang: Flags.string({ description: 'Language for the installed NocoBase app', char: 'l', required: false }),
         force: Flags.boolean({
             description: 'Reconfigure an existing env and replace conflicting runtime resources when needed',
@@ -303,6 +329,7 @@ export default class Install extends Command {
             required: false,
         }),
         'builtin-db': Flags.boolean({
+            allowNo: true,
             description: 'Create and connect a CLI-managed built-in database for the app',
             default: false,
         }),
@@ -368,7 +395,7 @@ export default class Install extends Command {
             type: 'text',
             message: installText('prompts.appPort.message'),
             placeholder: installText('prompts.appPort.placeholder'),
-            validate: validateAvailableTcpPort,
+            validate: Install.validateAppPort,
         },
         storagePath: {
             type: 'text',
@@ -428,7 +455,7 @@ export default class Install extends Command {
             placeholder: installText('prompts.dbPort.placeholder'),
             initialValue: (values) => defaultDbPortForDialect(values.dbDialect),
             required: true,
-            validate: validateTcpPort,
+            validate: Install.validateDbPort,
             hidden: (values) => Boolean(values.builtinDb)
                 && String(values.source ?? '').trim() === 'docker',
         },
@@ -486,7 +513,7 @@ export default class Install extends Command {
      * App catalog with `env` seeded into `out` first so `storagePath`’s `initialValue(values)`
      * sees `values.env` (same iteration order as {@link runPromptCatalog}).
      */
-    static buildAppPromptsCatalog(seedEnv) {
+    static buildAppPromptsCatalog(seedEnv, options) {
         return {
             seedEnv: {
                 type: 'run',
@@ -494,12 +521,27 @@ export default class Install extends Command {
                     values.env = seedEnv;
                 },
             },
+            seedResume: {
+                type: 'run',
+                run: (values) => {
+                    const record = values;
+                    record.resume = Boolean(options?.resume);
+                },
+            },
             ...Install.appPrompts,
         };
     }
-    static buildDbPromptsCatalog(downloadResults) {
+    static buildDbPromptsCatalog(envName, downloadResults, options) {
         const source = String(downloadResults.source ?? '').trim();
         return {
+            seedEnv: {
+                type: 'run',
+                run: (values) => {
+                    if (envName) {
+                        values.env = envName;
+                    }
+                },
+            },
             seedDownloadSource: {
                 type: 'run',
                 run: (values) => {
@@ -508,6 +550,13 @@ export default class Install extends Command {
                     }
                 },
             },
+            seedResume: {
+                type: 'run',
+                run: (values) => {
+                    const record = values;
+                    record.resume = Boolean(options?.resume);
+                },
+            },
             ...Install.dbPrompts,
         };
     }
@@ -527,6 +576,25 @@ export default class Install extends Command {
     static buildPresetValuesFromFlags(flags) {
         const preset = {};
         const argv = process.argv.slice(2);
+        const apiBaseUrl = Install.toOptionalPromptString(flags['api-base-url']);
+        if (apiBaseUrl) {
+            preset.apiBaseUrl = apiBaseUrl;
+        }
+        else if (flags['default-api-base-url'] !== undefined) {
+            const defaultApiBaseUrl = Install.toOptionalPromptString(flags['default-api-base-url']);
+            if (defaultApiBaseUrl) {
+                preset.apiBaseUrl = defaultApiBaseUrl;
+            }
+        }
+        if (flags['auth-type'] !== undefined) {
+            const authType = Install.toOptionalPromptString(flags['auth-type']);
+            if (authType) {
+                preset.authType = authType;
+            }
+        }
+        if (flags['access-token'] !== undefined || flags.token !== undefined) {
+            preset.accessToken = String(flags['access-token'] ?? flags.token ?? '');
+        }
         if (flags.lang !== undefined) {
             const v = String(flags.lang).trim();
             if (v) {
@@ -569,7 +637,7 @@ export default class Install extends Command {
         if (argvHasToken(argv, ['--fetch-source'])) {
             preset.fetchSource = flags['fetch-source'];
         }
-        if (argvHasToken(argv, ['--builtin-db'])) {
+        if (argvHasToken(argv, ['--builtin-db', '--no-builtin-db'])) {
             preset.builtinDb = flags['builtin-db'];
         }
         if (flags['db-dialect'] !== undefined) {
@@ -588,6 +656,7 @@ export default class Install extends Command {
             const v = String(flags['db-host'] ?? '').trim();
             if (v) {
                 preset.dbHost = v;
+                preset.builtinDb = false;
             }
         }
         if (flags['db-port'] !== undefined) {
@@ -643,6 +712,13 @@ export default class Install extends Command {
             'rootNickname',
         ]);
     }
+    static buildEnvAddPresetValuesFromFlags(flags) {
+        return pickPresetKeys(Install.buildPresetValuesFromFlags(flags), [
+            'apiBaseUrl',
+            'authType',
+            'accessToken',
+        ]);
+    }
     static toOptionalPromptString(value) {
         if (value === undefined || value === null) {
             return undefined;
@@ -650,6 +726,131 @@ export default class Install extends Command {
         const text = String(value).trim();
         return text || undefined;
     }
+    static async validateAppPort(value, values) {
+        const formatError = validateTcpPort(value);
+        if (formatError) {
+            return formatError;
+        }
+        return await Install.validateResumeAwareTcpPort(value, values, 'app');
+    }
+    static async validateDbPort(value, values) {
+        const formatError = validateTcpPort(value);
+        if (formatError) {
+            return formatError;
+        }
+        const builtinDb = values.builtinDb === undefined ? true : Boolean(values.builtinDb);
+        const source = String(values.source ?? '').trim();
+        if (!builtinDb || source === 'docker') {
+            return undefined;
+        }
+        return await Install.validateResumeAwareTcpPort(value, values, 'db');
+    }
+    static async validateResumeAwareTcpPort(value, values, target) {
+        const portError = await validateAvailableTcpPort(value);
+        if (!portError) {
+            return undefined;
+        }
+        const context = await Install.readResumePortValidationContext(values);
+        if (!context) {
+            return portError;
+        }
+        const port = Install.toOptionalPromptString(value);
+        if (!port) {
+            return portError;
+        }
+        const reusesManagedPort = await Install.isResumeManagedPortReuse({
+            target,
+            port,
+            context,
+        });
+        return reusesManagedPort ? undefined : portError;
+    }
+    static async readResumePortValidationContext(values) {
+        if (!Boolean(values.resume)) {
+            return undefined;
+        }
+        const envName = Install.toOptionalPromptString(values.env);
+        if (!envName) {
+            return undefined;
+        }
+        const source = Install.toOptionalPromptString(values.source);
+        const builtinDb = values.builtinDb === undefined ? undefined : Boolean(values.builtinDb);
+        const dbDialect = Install.toOptionalPromptString(values.dbDialect);
+        const appRootPath = Install.toOptionalPromptString(values.appRootPath);
+        const workspaceName = Install.toOptionalPromptString(values.workspaceName)
+            ?? await Install.resolveResumeWorkspaceName(envName);
+        return {
+            envName,
+            ...(workspaceName ? { workspaceName } : {}),
+            ...(source ? { source } : {}),
+            ...(builtinDb !== undefined ? { builtinDb } : {}),
+            ...(dbDialect ? { dbDialect } : {}),
+            ...(appRootPath ? { appRootPath } : {}),
+        };
+    }
+    static async resolveResumeWorkspaceName(envName) {
+        if (!envName) {
+            return undefined;
+        }
+        const config = await loadAuthConfig({ scope: resolveDefaultConfigScope() });
+        const stored = String(config.name ?? '').trim();
+        return stored || Install.defaultWorkspaceName();
+    }
+    static async isResumeManagedPortReuse(params) {
+        if (params.target === 'app') {
+            if ((params.context.source === 'npm' || params.context.source === 'git')
+                && params.context.appRootPath) {
+                return await Install.isLocalPm2ProcessUsingPort(params.context.appRootPath, params.port);
+            }
+            const containerName = Install.buildDockerAppContainerName(params.context.envName, params.context.workspaceName);
+            return await Install.isDockerContainerPublishingPort(containerName, params.port);
+        }
+        if (!params.context.builtinDb || params.context.source === 'docker') {
+            return false;
+        }
+        const containerName = Install.buildBuiltinDbContainerName(params.context.envName, params.context.dbDialect ?? 'postgres', params.context.workspaceName);
+        return await Install.isDockerContainerPublishingPort(containerName, params.port);
+    }
+    static async isDockerContainerPublishingPort(containerName, port) {
+        if (!containerName || !port) {
+            return false;
+        }
+        const exists = await commandSucceeds('docker', [
+            'container',
+            'inspect',
+            containerName,
+        ]);
+        if (!exists) {
+            return false;
+        }
+        try {
+            const output = await commandOutput('docker', ['port', containerName]);
+            return output
+                .split(/\r?\n/)
+                .some((line) => line.includes(`:${port}`));
+        }
+        catch {
+            return false;
+        }
+    }
+    static async isLocalPm2ProcessUsingPort(appRootPath, port) {
+        const cwd = resolveConfiguredEnvPath(appRootPath);
+        if (!cwd) {
+            return false;
+        }
+        try {
+            const output = await commandOutput('pm2', ['jlist'], { cwd });
+            const rows = JSON.parse(output);
+            return rows.some((row) => {
+                const pmCwd = Install.toOptionalPromptString(row.pm2_env?.pm_cwd);
+                const appPort = Install.toOptionalPromptString(row.pm2_env?.env?.APP_PORT);
+                return Boolean(pmCwd && appPort && pmCwd === cwd && appPort === port);
+            });
+        }
+        catch {
+            return false;
+        }
+    }
     static buildResumePresetValues(env) {
         const envName = String(env.name ?? '').trim();
         const config = env.config ?? {};
@@ -669,6 +870,10 @@ export default class Install extends Command {
         const dbUser = Install.toOptionalPromptString(config.dbUser);
         const dbPassword = Install.toOptionalPromptString(config.dbPassword);
         const builtinDbImage = Install.toOptionalPromptString(config.builtinDbImage);
+        const rootUsername = Install.toOptionalPromptString(config.rootUsername);
+        const rootEmail = Install.toOptionalPromptString(config.rootEmail);
+        const rootPassword = Install.toOptionalPromptString(config.rootPassword);
+        const rootNickname = Install.toOptionalPromptString(config.rootNickname);
         const auth = config.auth;
         const appPreset = {
             ...(appRootPath ? { appRootPath } : {}),
@@ -682,7 +887,14 @@ export default class Install extends Command {
         };
         const downloadPreset = {
             ...(source ? { source } : {}),
-            ...(downloadVersion ? { version: downloadVersion } : {}),
+            ...(downloadVersion
+                ? {
+                    version: downloadVersionPromptValue(downloadVersion),
+                    ...(downloadVersionPromptValue(downloadVersion) === 'other'
+                        ? { otherVersion: downloadVersion }
+                        : {}),
+                }
+                : {}),
             ...(dockerRegistry ? { dockerRegistry } : {}),
             ...(dockerPlatform ? { dockerPlatform } : {}),
             ...(gitUrl ? { gitUrl } : {}),
@@ -703,6 +915,12 @@ export default class Install extends Command {
             ...(dbUser ? { dbUser } : {}),
             ...(dbPassword ? { dbPassword } : {}),
         };
+        const rootPreset = {
+            ...(rootUsername ? { rootUsername } : {}),
+            ...(rootEmail ? { rootEmail } : {}),
+            ...(rootPassword ? { rootPassword } : {}),
+            ...(rootNickname ? { rootNickname } : {}),
+        };
         const envAddPreset = {};
         if (auth?.type === 'token') {
             envAddPreset.authType = 'token';
@@ -720,6 +938,7 @@ export default class Install extends Command {
             appPreset,
             downloadPreset,
             dbPreset,
+            rootPreset,
             envAddPreset,
         };
     }
@@ -746,7 +965,7 @@ export default class Install extends Command {
         if (!parsed.resume) {
             return undefined;
         }
-        const env = await getEnv(parsed.env, { scope: CONFIG_SCOPE });
+        const env = await getEnv(parsed.env, { scope: resolveDefaultConfigScope() });
         if (!env) {
             throw new Error(formatMissingManagedAppEnvMessage(parsed.env));
         }
@@ -756,7 +975,7 @@ export default class Install extends Command {
                 throw new Error([
                     `Cannot continue setup for "${env.name}" in non-interactive resume mode yet.`,
                     `These setup-only flags are not saved in the env config: ${missingFlags.join(', ')}`,
-                    `Run \`nb install --env ${env.name} --resume\` without \`--yes\`, or pass those flags again.`,
+                    `Run \`nb init --env ${env.name} --resume\` without \`--yes\`, or pass those flags again.`,
                 ].join('\n'));
             }
         }
@@ -861,7 +1080,11 @@ export default class Install extends Command {
             preset.source = String(flags.source).trim();
         }
         if (flags.version !== undefined) {
-            preset.version = String(flags.version).trim() || 'latest';
+            const version = String(flags.version).trim() || 'latest';
+            preset.version = downloadVersionPromptValue(version);
+            if (preset.version === 'other') {
+                preset.otherVersion = version;
+            }
         }
         if (flags['docker-registry'] !== undefined) {
             const value = String(flags['docker-registry'] ?? '').trim();
@@ -891,7 +1114,10 @@ export default class Install extends Command {
             preset.npmRegistry =
                 typeof flags['npm-registry'] === 'string' ? flags['npm-registry'] : '';
         }
-        if (argvHasToken(argv, ['--replace', '-r'])) {
+        if (flags.resume && !argvHasToken(argv, ['--replace', '-r'])) {
+            preset.replace = true;
+        }
+        else if (argvHasToken(argv, ['--replace', '-r'])) {
             preset.replace = flags.replace;
         }
         if (argvHasToken(argv, ['--dev-dependencies', '--no-dev-dependencies', '-D'])) {
@@ -923,7 +1149,7 @@ export default class Install extends Command {
         return normalized || 'nocobase';
     }
     static defaultWorkspaceName() {
-        return Install.sanitizeDockerResourceName(`nb-${path.basename(process.cwd())}`);
+        return Install.sanitizeDockerResourceName(`nb-${path.basename(resolveEnvRoot(resolveDefaultConfigScope()))}`);
     }
     static buildBuiltinDbResourcePrefix(envName, workspaceName) {
         void envName;
@@ -933,7 +1159,7 @@ export default class Install extends Command {
             : Install.defaultWorkspaceName();
     }
     static async ensureWorkspaceName() {
-        return await ensureWorkspaceName(Install.defaultWorkspaceName(), { scope: CONFIG_SCOPE });
+        return await ensureWorkspaceName(Install.defaultWorkspaceName(), { scope: resolveDefaultConfigScope() });
     }
     static buildBuiltinDbNetworkName(envName, workspaceName) {
         return Install.buildBuiltinDbResourcePrefix(envName, workspaceName);
@@ -982,9 +1208,11 @@ export default class Install extends Command {
                 && dbHostInput !== 'localhost'
                 ? dbHostInput
                 : containerName);
+        const storagePath = resolveConfiguredEnvPath(params.storagePath)
+            ?? resolveEnvRelativePath(defaultInstallStoragePath(params.envName));
         if (dbDialect === 'postgres') {
             const image = String(params.builtinDbImage ?? '').trim() || defaultBuiltinDbImageForDialect(dbDialect);
-            const dataDir = path.resolve(params.storagePath, 'db', 'postgres');
+            const dataDir = path.resolve(storagePath, 'db', 'postgres');
             const args = [
                 'run',
                 '-d',
@@ -1028,7 +1256,7 @@ export default class Install extends Command {
         }
         if (dbDialect === 'mysql') {
             const image = String(params.builtinDbImage ?? '').trim() || defaultBuiltinDbImageForDialect(dbDialect);
-            const dataDir = path.resolve(params.storagePath, 'db', 'mysql');
+            const dataDir = path.resolve(storagePath, 'db', 'mysql');
             const dbUser = String(params.dbUser ?? DEFAULT_INSTALL_DB_USER).trim() || DEFAULT_INSTALL_DB_USER;
             const dbDatabase = String(params.dbDatabase ?? defaultDbDatabase).trim() || defaultDbDatabase;
             const dbPassword = String(params.dbPassword ?? DEFAULT_INSTALL_DB_PASSWORD) || DEFAULT_INSTALL_DB_PASSWORD;
@@ -1074,7 +1302,7 @@ export default class Install extends Command {
         }
         if (dbDialect === 'mariadb') {
             const image = String(params.builtinDbImage ?? '').trim() || defaultBuiltinDbImageForDialect(dbDialect);
-            const dataDir = path.resolve(params.storagePath, 'db', 'mariadb');
+            const dataDir = path.resolve(storagePath, 'db', 'mariadb');
             const dbUser = String(params.dbUser ?? DEFAULT_INSTALL_DB_USER).trim() || DEFAULT_INSTALL_DB_USER;
             const dbDatabase = String(params.dbDatabase ?? defaultDbDatabase).trim() || defaultDbDatabase;
             const dbPassword = String(params.dbPassword ?? DEFAULT_INSTALL_DB_PASSWORD) || DEFAULT_INSTALL_DB_PASSWORD;
@@ -1120,7 +1348,7 @@ export default class Install extends Command {
         }
         if (dbDialect === 'kingbase') {
             const image = String(params.builtinDbImage ?? '').trim() || defaultBuiltinDbImageForDialect(dbDialect);
-            const dataDir = path.resolve(params.storagePath, 'db', 'kingbase');
+            const dataDir = path.resolve(storagePath, 'db', 'kingbase');
             const dbUser = String(params.dbUser ?? DEFAULT_INSTALL_DB_USER).trim() || DEFAULT_INSTALL_DB_USER;
             const dbDatabase = String(params.dbDatabase ?? defaultDbDatabase).trim() || defaultDbDatabase;
             const dbPassword = String(params.dbPassword ?? DEFAULT_INSTALL_DB_PASSWORD) || DEFAULT_INSTALL_DB_PASSWORD;
@@ -1269,12 +1497,12 @@ export default class Install extends Command {
         });
         p.log.step(`Preparing built-in ${plan.dbDialect} database`);
         await this.ensureDockerNetwork(plan.networkName);
-        await this.removeDockerContainerIfForced({
+        const existingContainerKept = await this.removeDockerContainerIfForced({
             containerName: plan.containerName,
             displayName: `built-in ${plan.dbDialect} container`,
             force: params.force,
         });
-        if (Install.shouldPublishBuiltinDbPort(params.downloadResults.source)) {
+        if (!existingContainerKept && Install.shouldPublishBuiltinDbPort(params.downloadResults.source)) {
             const portError = await validateAvailableTcpPort(plan.dbPort);
             if (portError) {
                 throw new Error(`Built-in ${plan.dbDialect} needs host port ${plan.dbPort}, but ${portError}`);
@@ -1291,8 +1519,9 @@ export default class Install extends Command {
             || defaultDockerRegistryForLang(process.env.NB_LOCALE);
         const version = String(downloadResultsValue(params.downloadResults, 'version') ?? '').trim() || 'latest';
         const appPort = String(params.appResults.appPort ?? DEFAULT_INSTALL_APP_PORT).trim() || DEFAULT_INSTALL_APP_PORT;
-        const storagePath = path.resolve(String(params.appResults.storagePath ?? '').trim()
-            || defaultInstallStoragePath(params.envName));
+        const storagePath = resolveConfiguredEnvPath(String(params.appResults.storagePath ?? '').trim()
+            || defaultInstallStoragePath(params.envName))
+            ?? resolveEnvRelativePath(defaultInstallStoragePath(params.envName));
         const dbDialect = String(params.dbResults.dbDialect ?? 'postgres').trim() || 'postgres';
         const dbHost = String(params.dbResults.dbHost ?? DEFAULT_INSTALL_DB_HOST).trim() || DEFAULT_INSTALL_DB_HOST;
         const dbPort = String(params.dbResults.dbPort ?? defaultDbPortForDialect(dbDialect)).trim()
@@ -1387,12 +1616,16 @@ export default class Install extends Command {
     }
     static buildDownloadArgvFromResults(results, options) {
         const argv = ['-y', '--no-intro'];
+        const source = String(results.source ?? '').trim();
         if (options?.verbose) {
             argv.push('--verbose');
         }
         Install.pushDownloadArgIfValue(argv, '--source', results.source);
-        Install.pushDownloadArgIfValue(argv, '--version', results.version);
-        Install.pushDownloadArgIfValue(argv, '--output-dir', results.outputDir);
+        Install.pushDownloadArgIfValue(argv, '--version', downloadResultsValue(results, 'version'));
+        Install.pushDownloadArgIfValue(argv, '--output-dir', source === 'npm' || source === 'git'
+            ? (resolveConfiguredEnvPath(results.outputDir)
+                ?? resolveConfiguredEnvPath(String(results.outputDir ?? '').trim() || defaultInstallAppRootPath(results.env)))
+            : results.outputDir);
         Install.pushDownloadArgIfValue(argv, '--git-url', results.gitUrl);
         Install.pushDownloadArgIfValue(argv, '--docker-registry', results.dockerRegistry);
         Install.pushDownloadArgIfValue(argv, '--docker-platform', results.dockerPlatform);
@@ -1422,7 +1655,12 @@ export default class Install extends Command {
         const outputDir = String(params.downloadResults.outputDir ?? '').trim()
             || String(params.appResults.appRootPath ?? '').trim()
             || defaultInstallAppRootPath(params.envName);
-        return path.resolve(process.cwd(), outputDir);
+        return resolveConfiguredEnvPath(outputDir) ?? resolveEnvRelativePath(defaultInstallAppRootPath(params.envName));
+    }
+    static resolveLocalProjectConfigPath(params) {
+        return (String(params.downloadResults.outputDir ?? '').trim()
+            || String(params.appResults.appRootPath ?? '').trim()
+            || defaultInstallAppRootPath(params.envName));
     }
     commandStdio(verbose) {
         return verbose ? 'inherit' : 'ignore';
@@ -1435,25 +1673,31 @@ export default class Install extends Command {
         p.log.step(source === 'docker'
             ? 'Downloading Docker image'
             : 'Downloading local NocoBase app files');
-        return await this.config.runCommand('download', argv);
+        return await this.config.runCommand('source:download', argv);
     }
     async downloadLocalApp(params) {
         const result = await this.downloadManagedSource({
             downloadResults: params.downloadResults,
             verbose: params.verbose,
         });
-        const projectRoot = Install.resolveLocalProjectRoot({
+        const downloadedProjectRoot = Install.resolveLocalProjectRoot({
             envName: params.envName,
             appResults: params.appResults,
             downloadResults: params.downloadResults,
             downloadCommandResult: result,
         });
-        params.appResults.appRootPath = projectRoot;
-        return projectRoot;
+        params.appResults.appRootPath = Install.resolveLocalProjectConfigPath({
+            envName: params.envName,
+            appResults: params.appResults,
+            downloadResults: params.downloadResults,
+        });
+        return downloadedProjectRoot;
     }
     static buildLocalAppEnvVars(params) {
-        const storagePath = path.resolve(String(params.appResults.storagePath ?? '').trim()
-            || defaultInstallStoragePath(params.envName));
+        const configuredStoragePath = String(params.appResults.storagePath ?? '').trim()
+            || defaultInstallStoragePath(params.envName);
+        const storagePath = resolveConfiguredEnvPath(configuredStoragePath)
+            ?? resolveEnvRelativePath(defaultInstallStoragePath(params.envName));
         const dbDialect = String(params.dbResults.dbDialect ?? 'postgres').trim()
             || 'postgres';
         const appKey = crypto.randomBytes(32).toString('hex');
@@ -1618,21 +1862,20 @@ export default class Install extends Command {
         throw new Error(`The application did not become ready in time. Expected \`${healthCheckUrl}\` to respond with \`ok\`, but the last status was: ${Install.formatHealthCheckMessage(lastMessage)}.${logHint}`);
     }
     async saveInstalledEnv(params) {
-        await this.config.runCommand('env:add', Install.buildEnvAddArgv(params));
-    }
-    static pushArgIfValue(argv, flag, value) {
-        const text = String(value ?? '').trim();
-        if (text) {
-            argv.push(flag, text);
-        }
+        await upsertEnv(params.envName, Install.buildSavedEnvConfig(params), { scope: resolveDefaultConfigScope() });
     }
-    static pushBooleanArgIfSet(argv, flag, value) {
-        if (value === undefined) {
+    async syncInstalledEnvConnection(params) {
+        if (!params.appReady) {
             return;
         }
-        argv.push(Boolean(value) ? flag : `--no-${flag.replace(/^--/, '')}`);
+        const authType = String(params.envAddResults.authType ?? 'oauth').trim()
+            || 'oauth';
+        if (authType === 'oauth') {
+            await this.config.runCommand('env:auth', [params.envName]);
+        }
+        await this.config.runCommand('env:update', [params.envName]);
     }
-    static buildEnvAddArgv(params) {
+    static buildSavedEnvConfig(params) {
         const appPort = String(params.appResults.appPort ?? DEFAULT_INSTALL_APP_PORT).trim()
             || DEFAULT_INSTALL_APP_PORT;
         const storagePath = String(params.appResults.storagePath ?? '').trim()
@@ -1643,44 +1886,37 @@ export default class Install extends Command {
         });
         const authType = String(params.envAddResults.authType ?? 'oauth').trim()
             || 'oauth';
-        const argv = [
-            params.envName,
-            '--no-intro',
-            '--scope',
-            CONFIG_SCOPE,
-            '--api-base-url',
+        return buildStoredEnvConfig({
             apiBaseUrl,
-            '--auth-type',
             authType,
-            '--app-port',
+            accessToken: params.envAddResults.accessToken,
+            source: downloadResultsValue(params.downloadResults, 'source'),
+            downloadVersion: downloadResultsValue(params.downloadResults, 'version'),
+            dockerRegistry: downloadResultsValue(params.downloadResults, 'dockerRegistry'),
+            dockerPlatform: downloadResultsValue(params.downloadResults, 'dockerPlatform'),
+            gitUrl: downloadResultsValue(params.downloadResults, 'gitUrl'),
+            npmRegistry: downloadResultsValue(params.downloadResults, 'npmRegistry'),
+            devDependencies: downloadResultsValue(params.downloadResults, 'devDependencies'),
+            build: downloadResultsValue(params.downloadResults, 'build'),
+            buildDts: downloadResultsValue(params.downloadResults, 'buildDts'),
+            appRootPath: params.appResults.appRootPath,
             appPort,
-            '--storage-path',
             storagePath,
-        ];
-        Install.pushArgIfValue(argv, '--source', downloadResultsValue(params.downloadResults, 'source'));
-        Install.pushArgIfValue(argv, '--download-version', downloadResultsValue(params.downloadResults, 'version'));
-        Install.pushArgIfValue(argv, '--docker-registry', downloadResultsValue(params.downloadResults, 'dockerRegistry'));
-        Install.pushArgIfValue(argv, '--docker-platform', downloadResultsValue(params.downloadResults, 'dockerPlatform'));
-        Install.pushArgIfValue(argv, '--git-url', downloadResultsValue(params.downloadResults, 'gitUrl'));
-        Install.pushArgIfValue(argv, '--npm-registry', downloadResultsValue(params.downloadResults, 'npmRegistry'));
-        Install.pushBooleanArgIfSet(argv, '--dev-dependencies', downloadResultsValue(params.downloadResults, 'devDependencies'));
-        Install.pushBooleanArgIfSet(argv, '--build', downloadResultsValue(params.downloadResults, 'build'));
-        Install.pushBooleanArgIfSet(argv, '--build-dts', downloadResultsValue(params.downloadResults, 'buildDts'));
-        Install.pushArgIfValue(argv, '--app-root-path', params.appResults.appRootPath);
-        Install.pushArgIfValue(argv, '--app-key', params.appResults.appKey);
-        Install.pushArgIfValue(argv, '--timezone', params.appResults.timeZone);
-        Install.pushBooleanArgIfSet(argv, '--builtin-db', params.dbResults.builtinDb);
-        Install.pushArgIfValue(argv, '--db-dialect', params.dbResults.dbDialect);
-        Install.pushArgIfValue(argv, '--builtin-db-image', params.dbResults.builtinDbImage);
-        Install.pushArgIfValue(argv, '--db-host', params.dbResults.dbHost);
-        Install.pushArgIfValue(argv, '--db-port', params.dbResults.dbPort);
-        Install.pushArgIfValue(argv, '--db-database', params.dbResults.dbDatabase);
-        Install.pushArgIfValue(argv, '--db-user', params.dbResults.dbUser);
-        Install.pushArgIfValue(argv, '--db-password', params.dbResults.dbPassword);
-        if (authType === 'token') {
-            argv.push('--access-token', String(params.envAddResults.accessToken ?? ''));
-        }
-        return argv;
+            appKey: params.appResults.appKey,
+            timezone: params.appResults.timeZone,
+            builtinDb: params.dbResults.builtinDb,
+            dbDialect: params.dbResults.dbDialect,
+            builtinDbImage: params.dbResults.builtinDbImage,
+            dbHost: params.dbResults.dbHost,
+            dbPort: params.dbResults.dbPort,
+            dbDatabase: params.dbResults.dbDatabase,
+            dbUser: params.dbResults.dbUser,
+            dbPassword: params.dbResults.dbPassword,
+            rootUsername: params.rootResults.rootUsername,
+            rootEmail: params.rootResults.rootEmail,
+            rootPassword: params.rootResults.rootPassword,
+            rootNickname: params.rootResults.rootNickname,
+        });
     }
     async collectPromptResults(parsed, yes) {
         const resumePreset = await this.resolveResumePresetValues(parsed, yes);
@@ -1700,7 +1936,9 @@ export default class Install extends Command {
             ...(resumePreset?.appPreset ?? {}),
             ...Install.buildAppPresetValuesFromFlags(parsed),
         };
-        const appCatalog = Install.buildAppPromptsCatalog(envName);
+        const appCatalog = Install.buildAppPromptsCatalog(envName, {
+            resume: parsed.resume,
+        });
         const appResults = await runPromptCatalog(appCatalog, {
             initialValues: await Install.buildAppPromptInitialValues({
                 envName,
@@ -1715,6 +1953,7 @@ export default class Install extends Command {
                 },
             }),
             values: appPreset,
+            yesInitialValues: { resume: parsed.resume },
             yes,
         });
         let downloadResults = {};
@@ -1732,7 +1971,9 @@ export default class Install extends Command {
             ...(resumePreset?.dbPreset ?? {}),
             ...Install.buildDbPresetValuesFromFlags(parsed),
         };
-        const dbResults = await runPromptCatalog(Install.buildDbPromptsCatalog(downloadResults), {
+        const dbResults = await runPromptCatalog(Install.buildDbPromptsCatalog(envName, downloadResults, {
+            resume: parsed.resume,
+        }), {
             initialValues: {
                 ...downloadResults,
                 ...await Install.buildDbPromptInitialValues({
@@ -1751,7 +1992,10 @@ export default class Install extends Command {
         const rootPreset = Install.buildRootPresetValuesFromFlags(parsed);
         const rootResults = await runPromptCatalog(Install.rootUserPrompts, {
             initialValues: {},
-            values: rootPreset,
+            values: {
+                ...(resumePreset?.rootPreset ?? {}),
+                ...rootPreset,
+            },
             yes,
         });
         const envAddResults = await runPromptCatalog(EnvAdd.prompts, {
@@ -1760,8 +2004,8 @@ export default class Install extends Command {
             },
             values: {
                 name: envName,
-                scope: 'project',
                 ...(resumePreset?.envAddPreset ?? {}),
+                ...Install.buildEnvAddPresetValuesFromFlags(parsed),
             },
             yes,
         });
@@ -1800,6 +2044,16 @@ export default class Install extends Command {
         const workspaceName = usesDockerResources
             ? await Install.ensureWorkspaceName()
             : undefined;
+        if (!parsed.resume) {
+            await this.saveInstalledEnv({
+                envName,
+                appResults,
+                downloadResults,
+                dbResults,
+                rootResults,
+                envAddResults,
+            });
+        }
         let builtinDbPlan;
         if (Boolean(dbResults.builtinDb)) {
             builtinDbPlan = await this.startBuiltinDb({
@@ -1841,6 +2095,7 @@ export default class Install extends Command {
                 appResults.timeZone = dockerAppPlan.timeZone;
             }
             else if (source === 'npm' || source === 'git') {
+                const localSource = source === 'npm' ? 'npm' : 'git';
                 const projectRoot = await this.downloadLocalApp({
                     envName,
                     appResults,
@@ -1849,7 +2104,7 @@ export default class Install extends Command {
                 });
                 localAppPlan = await this.startLocalApp({
                     envName,
-                    source,
+                    source: localSource,
                     projectRoot,
                     appResults,
                     dbResults,
@@ -1871,12 +2126,20 @@ export default class Install extends Command {
                 containerName: dockerAppPlan?.containerName,
             });
         }
-        await this.saveInstalledEnv({
+        if (dockerAppPlan || localAppPlan || builtinDbPlan) {
+            await this.saveInstalledEnv({
+                envName,
+                appResults,
+                downloadResults,
+                dbResults,
+                rootResults,
+                envAddResults,
+            });
+        }
+        await this.syncInstalledEnvConnection({
             envName,
-            appResults,
-            downloadResults,
-            dbResults,
             envAddResults,
+            appReady: Boolean(dockerAppPlan || localAppPlan),
         });
         p.outro(dockerAppPlan || localAppPlan
             ? `NocoBase is ready at http://127.0.0.1:${dockerAppPlan?.appPort ?? localAppPlan?.appPort}`
@@ -1884,5 +2147,8 @@ export default class Install extends Command {
     }
 }
 function downloadResultsValue(downloadResults, key) {
+    if (key === 'version' && String(downloadResults.version ?? '').trim() === 'other') {
+        return downloadResults.otherVersion;
+    }
     return downloadResults[key];
 }