@nocobase/cli 2.2.0-test.16 → 3.0.0-alpha.1

package/dist/commands/app/start.js

@@ -14,7 +14,6 @@ import { AppHealthCheckError, formatAppUrl, isAppReady, resolveManagedAppApiBase
 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 { prepareInitialPortalTemplate } from '../../lib/portal-template.js';
 import { resolveAppUrlFromApiBaseUrl } from '../env/shared.js';
 import { readManagedRuntimeEnvValues } from '../../lib/managed-env-file.js';
 import { run } from '../../lib/run-npm.js';
@@ -182,19 +181,6 @@ async function finalizePreparedEnv(envName) {
         setupState: 'installed',
     });
 }
-async function prepareInitialPortalForRuntime(runtime, verbose) {
-    await prepareInitialPortalTemplate({
-        developmentMode: runtime.env.config?.developmentMode,
-        portalName: runtime.env.config?.portalName,
-        portalTemplate: runtime.env.config?.portalTemplate,
-        npmRegistry: runtime.env.config?.npmRegistry,
-        storagePath: runtime.env.storagePath || runtime.env.config?.storagePath,
-        verbose,
-        onStartTask: startTask,
-        onSucceedTask: succeedTask,
-        onFailTask: failTask,
-    });
-}
 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.';
@@ -263,7 +249,7 @@ 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, { includePortal: false });
+        const preparedInitEnvVars = buildInitAppEnvVarsFromConfig(runtime?.env.config);
         const isPreparedEnv = isPreparedSetupState(runtime?.env.config?.setupState);
         const hookCommand = resolveHookCommand(flags['hook-command']);
         const hookPhase = resolveAppStartHookPhase({
@@ -336,9 +322,6 @@ export default class AppStart extends Command {
                         command: hookCommand,
                     });
                 }
-                if (isPreparedEnv) {
-                    await prepareInitialPortalForRuntime(runtime, flags.verbose);
-                }
                 await recreateSavedDockerApp(runtime, {
                     initEnvVars: isPreparedEnv ? preparedInitEnvVars : undefined,
                     verbose: flags.verbose,
@@ -487,9 +470,6 @@ export default class AppStart extends Command {
                     command: hookCommand,
                 });
             }
-            if (isPreparedEnv) {
-                await prepareInitialPortalForRuntime(runtime, flags.verbose);
-            }
             await runLocalNocoBaseCommand(runtime, npmArgs, {
                 env: startEnv,
                 stdio: commandStdio,

package/dist/commands/config/set.js

@@ -14,7 +14,7 @@ export default class ConfigSet extends Command {
     static description = 'Set a CLI configuration value for a supported configuration key.';
     static examples = [
         '<%= config.bin %> <%= command.id %> locale zh-CN',
-        '<%= config.bin %> <%= command.id %> default-portal-template git@github.com:nocobase/admin-starter.git',
+        '<%= config.bin %> <%= command.id %> default-portal-template @nocobase/portal-template-default',
         '<%= config.bin %> <%= command.id %> update.policy prompt',
         '<%= config.bin %> <%= command.id %> docker.network nocobase',
         '<%= config.bin %> <%= command.id %> docker.container-prefix nb',

package/dist/commands/init.js

@@ -27,17 +27,14 @@ import { omitKeys, pickKeys } from "../lib/object-utils.js";
 import { ENV_CONFIG_SCHEMA_VERSION } from '../lib/env-config.js';
 import { printInfo, printStage, printVerbose, printWarning } from '../lib/ui.js';
 import { persistHookScript } from '../lib/hook-script.js';
+import { ensureManagedEnvFileDefaults } from '../lib/managed-env-file.js';
 import Download from "./download.js";
 import EnvAdd from "./env/add.js";
 import Install, { defaultDbPortForDialect } from "./install.js";
 const DEFAULT_INIT_API_BASE_URL = 'http://localhost:13000/api';
 const DEFAULT_INIT_APP_NAME = 'local';
-const DEFAULT_INIT_DEVELOPMENT_MODE = 'no-code';
-const DEFAULT_INIT_PORTAL_NAME = 'admin';
-const DEFAULT_INIT_PORTAL_TEMPLATE = 'git@github.com:nocobase/admin-starter.git';
 const DOWNLOAD_OUTPUT_DIR_PROMPT = Download.prompts.outputDir;
 const INIT_SETUP_MODES = ['install-new', 'manage-local', 'connect-remote'];
-const INIT_DEVELOPMENT_MODES = ['no-code', 'vibe-coding'];
 const INIT_ENV_ADD_FLAG_NAMES = [
     'locale',
     'default-api-base-url',
@@ -84,9 +81,6 @@ function isInstallNewSetupMode(values) {
 function isInstallLikeSetupMode(values) {
     return !isRemoteSetupMode(values);
 }
-function isVibeCodingMode(values) {
-    return String(values.developmentMode ?? DEFAULT_INIT_DEVELOPMENT_MODE).trim() === 'vibe-coding';
-}
 function remoteConnectionOnly(def) {
     return withExtraHidden(def, (values) => !isRemoteSetupMode(values));
 }
@@ -394,43 +388,6 @@ Prompt modes:
         devDependencies: installLikeDownloadExecutionOnly(Download.prompts.devDependencies),
         build: installLikeDownloadExecutionOnly(Download.prompts.build),
         buildDts: installLikeDownloadExecutionOnly(Download.prompts.buildDts),
-        developmentMode: installNewOnly({
-            type: 'select',
-            variant: 'radio',
-            message: initText('prompts.developmentMode.message'),
-            options: [
-                {
-                    value: 'no-code',
-                    label: initText('prompts.developmentMode.noCodeLabel'),
-                    hint: initText('prompts.developmentMode.noCodeHint'),
-                },
-                {
-                    value: 'vibe-coding',
-                    label: initText('prompts.developmentMode.vibeCodingLabel'),
-                    hint: initText('prompts.developmentMode.vibeCodingHint'),
-                },
-            ],
-            initialValue: DEFAULT_INIT_DEVELOPMENT_MODE,
-            yesInitialValue: DEFAULT_INIT_DEVELOPMENT_MODE,
-            required: true,
-        }),
-        portalName: installNewOnly({
-            type: 'text',
-            message: initText('prompts.portalName.message'),
-            placeholder: DEFAULT_INIT_PORTAL_NAME,
-            initialValue: DEFAULT_INIT_PORTAL_NAME,
-            yesInitialValue: DEFAULT_INIT_PORTAL_NAME,
-            hidden: (values) => !isVibeCodingMode(values),
-            required: true,
-        }),
-        portalTemplate: installNewOnly({
-            type: 'text',
-            message: initText('prompts.portalTemplate.message'),
-            placeholder: DEFAULT_INIT_PORTAL_TEMPLATE,
-            yesInitialValue: DEFAULT_INIT_PORTAL_TEMPLATE,
-            hidden: (values) => !isVibeCodingMode(values),
-            required: true,
-        }),
         dbDialect: installLikeOnly(Install.dbPrompts.dbDialect),
         builtinDb: installLikeOnly(Install.dbPrompts.builtinDb),
         builtinDbImage: installLikeOnly(Install.dbPrompts.builtinDbImage),
@@ -456,13 +413,6 @@ Prompt modes:
             ...Init.prompts,
             installApiBaseUrl: createInstallConnectionApiBaseUrlPrompt(options.defaultApiHost),
         };
-        const defaultPortalTemplate = String(options.defaultPortalTemplate ?? '').trim();
-        if (defaultPortalTemplate) {
-            prompts.portalTemplate = {
-                ...prompts.portalTemplate,
-                yesInitialValue: defaultPortalTemplate,
-            };
-        }
         if (flags['skip-auth']) {
             const accessTokenPrompt = {
                 ...EnvAdd.prompts.accessToken,
@@ -512,16 +462,6 @@ Prompt modes:
             description: 'Setup mode: install a new app, manage a local app by reusing its database, or connect a remote app',
             options: [...INIT_SETUP_MODES],
         }),
-        'development-mode': Flags.string({
-            description: 'Initial development mode: no-code or vibe-coding',
-            options: [...INIT_DEVELOPMENT_MODES],
-        }),
-        'portal-name': Flags.string({
-            description: 'Initial portal name when --development-mode vibe-coding is used',
-        }),
-        'portal-template': Flags.string({
-            description: 'Initial portal template Git URL or local path when --development-mode vibe-coding is used',
-        }),
         ui: Flags.boolean({
             description: 'Open the guided setup flow in a local browser form (not valid with --yes)',
             default: false,
@@ -639,8 +579,7 @@ Prompt modes:
         const dynamicInitialValues = await Init.buildDynamicInitialValuesForInstall(normalizedFlags, presetValues);
         const defaultUiHost = await resolveDefaultUiHost();
         const defaultApiHost = await resolveDefaultApiHost();
-        const defaultPortalTemplate = String(dynamicInitialValues.portalTemplate ?? '').trim();
-        const promptCatalog = this.buildPromptCatalog(normalizedFlags, { defaultApiHost, defaultPortalTemplate });
+        const promptCatalog = this.buildPromptCatalog(normalizedFlags, { defaultApiHost });
         if (useBrowserUi) {
             presetValues = await runPromptCatalogWebUI({
                 stages: Init.buildWebUiStages(promptCatalog),
@@ -669,7 +608,7 @@ Prompt modes:
                     ? { setupMode: normalizeInitSetupMode(presetValues.hasNocobase) }
                     : {}),
             },
-            yesInitialValues: pickKeys(dynamicInitialValues, ['portalTemplate']),
+            yesInitialValues: {},
             values: presetValues,
             yes: normalizedFlags.yes || useBrowserUi || !interactive,
             hooks: {
@@ -742,8 +681,7 @@ Prompt modes:
     }
     static async buildDynamicInitialValuesForInstall(flags, presetValues) {
         const out = {};
-        const shouldResolveAppInitialValues = !Object.prototype.hasOwnProperty.call(presetValues, 'appPort') ||
-            !Object.prototype.hasOwnProperty.call(presetValues, 'portalTemplate');
+        const shouldResolveAppInitialValues = !Object.prototype.hasOwnProperty.call(presetValues, 'appPort');
         if (shouldResolveAppInitialValues) {
             const appInitialValues = await Install.buildAppPromptInitialValues({
                 envName: String(presetValues.appName ?? '').trim(),
@@ -752,20 +690,12 @@ Prompt modes:
                     'app-path': flags['app-path'] ?? '',
                     'app-root-path': flags['app-root-path'] ?? '',
                     'storage-path': flags['storage-path'] ?? '',
-                    'portal-template': flags['portal-template'] ??
-                        (Object.prototype.hasOwnProperty.call(presetValues, 'portalTemplate')
-                            ? String(presetValues.portalTemplate ?? '')
-                            : undefined),
                 },
                 warnOnPortFallback: false,
             });
             if (appInitialValues.appPort !== undefined && !Object.prototype.hasOwnProperty.call(presetValues, 'appPort')) {
                 out.appPort = appInitialValues.appPort;
             }
-            if (appInitialValues.portalTemplate !== undefined &&
-                !Object.prototype.hasOwnProperty.call(presetValues, 'portalTemplate')) {
-                out.portalTemplate = appInitialValues.portalTemplate;
-            }
         }
         const downloadSeed = { ...presetValues };
         if (flags.yes && !Object.prototype.hasOwnProperty.call(downloadSeed, 'source')) {
@@ -844,13 +774,6 @@ Prompt modes:
                     buildDts: c.buildDts,
                 },
             },
-            {
-                sectionTitle: initText('webUi.developmentMode.title'),
-                sectionDescription: initText('webUi.developmentMode.description'),
-                catalog: {
-                    developmentMode: c.developmentMode,
-                },
-            },
             {
                 sectionTitle: initText('webUi.configureDatabase.title'),
                 sectionDescription: initText('webUi.configureDatabase.description'),
@@ -951,15 +874,6 @@ Prompt modes:
         if (flags['app-public-path'] !== undefined && String(flags['app-public-path']).trim() !== '') {
             preset.appPublicPath = String(flags['app-public-path']).trim();
         }
-        if (flags['development-mode'] !== undefined && String(flags['development-mode']).trim() !== '') {
-            preset.developmentMode = String(flags['development-mode']).trim();
-        }
-        if (flags['portal-name'] !== undefined && String(flags['portal-name']).trim() !== '') {
-            preset.portalName = String(flags['portal-name']).trim();
-        }
-        if (flags['portal-template'] !== undefined && String(flags['portal-template']).trim() !== '') {
-            preset.portalTemplate = String(flags['portal-template']).trim();
-        }
         if (flags['root-username'] !== undefined) {
             preset.rootUsername = String(flags['root-username'] ?? '').trim();
         }
@@ -1097,9 +1011,6 @@ Prompt modes:
         const existingEnv = await getEnv(envName, { scope: resolveDefaultConfigScope() });
         const appPort = String(results.appPort ?? '').trim();
         const appPublicPath = String(results.appPublicPath ?? '').trim();
-        const developmentMode = String(results.developmentMode ?? '').trim();
-        const portalName = String(results.portalName ?? '').trim();
-        const portalTemplate = String(results.portalTemplate ?? '').trim();
         const source = String(results.source ?? '').trim();
         const version = resolveInitDownloadVersion(results);
         const dockerRegistry = String(results.dockerRegistry ?? '').trim();
@@ -1126,7 +1037,8 @@ Prompt modes:
         const dbSchema = String(results.dbSchema ?? '').trim();
         const dbTablePrefix = String(results.dbTablePrefix ?? '').trim();
         const apiBaseUrl = String(results.apiBaseUrl ?? '').trim();
-        const authType = String(results.authType ?? '').trim() || 'oauth';
+        const authTypeInput = String(results.authType ?? '').trim();
+        const authType = authTypeInput === 'basic' || authTypeInput === 'token' || authTypeInput === 'oauth' ? authTypeInput : 'oauth';
         const authUsername = authType === 'basic' ? String(results.username ?? results.rootUsername ?? '').trim() : '';
         const accessToken = String(results.accessToken ?? '');
         const skipDownload = results.skipDownload === true;
@@ -1147,7 +1059,7 @@ Prompt modes:
                 : Boolean(results.builtinDb);
         results.appKey = appKey;
         results.timeZone = timeZone;
-        await upsertEnv(envName, {
+        const savedEnvConfig = {
             schemaVersion: ENV_CONFIG_SCHEMA_VERSION,
             ...(source === 'docker'
                 ? { kind: 'docker' }
@@ -1172,9 +1084,6 @@ Prompt modes:
             ...(storagePath && !areConfiguredPathsEquivalent(storagePath, derivedStoragePath) ? { storagePath } : {}),
             ...(appPort ? { appPort } : {}),
             ...(appPublicPath ? { appPublicPath } : {}),
-            ...(developmentMode && developmentMode !== DEFAULT_INIT_DEVELOPMENT_MODE ? { developmentMode } : {}),
-            ...(portalName ? { portalName } : {}),
-            ...(portalTemplate ? { portalTemplate } : {}),
             ...(appKey ? { appKey } : {}),
             ...(timeZone ? { timezone: timeZone } : {}),
             ...(!skipDownload && results.devDependencies !== undefined
@@ -1195,7 +1104,11 @@ Prompt modes:
             ...(results.dbUnderscored !== undefined ? { dbUnderscored: Boolean(results.dbUnderscored) } : {}),
             setupState: 'prepared',
             ...(String(results.lang ?? '').trim() ? { lang: String(results.lang ?? '').trim() } : {}),
-        }, { scope: resolveDefaultConfigScope() });
+        };
+        await upsertEnv(envName, savedEnvConfig, { scope: resolveDefaultConfigScope() });
+        if (source === 'docker' || appPath) {
+            await ensureManagedEnvFileDefaults(envName, savedEnvConfig);
+        }
     }
     buildEnvAddArgv(results) {
         const argv = [String(results.appName ?? DEFAULT_INIT_APP_NAME)];
@@ -1299,18 +1212,6 @@ Prompt modes:
         if (appPublicPath) {
             argv.push('--app-public-path', appPublicPath);
         }
-        const developmentMode = String(results.developmentMode ?? '').trim();
-        if (developmentMode && developmentMode !== DEFAULT_INIT_DEVELOPMENT_MODE) {
-            argv.push('--development-mode', developmentMode);
-        }
-        const portalName = String(results.portalName ?? '').trim();
-        if (portalName) {
-            argv.push('--portal-name', portalName);
-        }
-        const portalTemplate = String(results.portalTemplate ?? '').trim();
-        if (portalTemplate) {
-            argv.push('--portal-template', portalTemplate);
-        }
         if (flags.force) {
             argv.push('--force');
         }
@@ -1508,16 +1409,6 @@ Prompt modes:
             delete normalized.rootPassword;
             delete normalized.rootNickname;
         }
-        const developmentMode = normalizeConnectionString(normalized.developmentMode) || DEFAULT_INIT_DEVELOPMENT_MODE;
-        normalized.developmentMode = developmentMode;
-        if (developmentMode === 'vibe-coding') {
-            normalized.portalName = normalizeConnectionString(normalized.portalName) || DEFAULT_INIT_PORTAL_NAME;
-            normalized.portalTemplate = normalizeConnectionString(normalized.portalTemplate);
-        }
-        else {
-            delete normalized.portalName;
-            delete normalized.portalTemplate;
-        }
         delete normalized.installApiBaseUrl;
         delete normalized.installAuthType;
         delete normalized.installUsername;

package/dist/commands/install.js

@@ -29,7 +29,7 @@ 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 { prepareInitialPortalTemplate } from '../lib/portal-template.js';
+import { ensureManagedEnvFileDefaults } from '../lib/managed-env-file.js';
 import { buildHookContext, persistHookScript, resolveHookScriptPath, runHookScriptHook, } from '../lib/hook-script.js';
 import { areConfiguredPathsEquivalent, deriveConfiguredSourcePath, deriveConfiguredStoragePath, inferConfiguredAppPathFromLegacyConfig, } from '../lib/env-paths.js';
 import Download from './download.js';
@@ -54,10 +54,10 @@ const DEFAULT_INSTALL_ROOT_EMAIL = 'admin@nocobase.com';
 const DEFAULT_INSTALL_ROOT_PASSWORD = 'admin123';
 const DEFAULT_INSTALL_ROOT_NICKNAME = 'Super Admin';
 const DEFAULT_INSTALL_API_HOST = '127.0.0.1';
-const DEFAULT_INSTALL_DEVELOPMENT_MODE = 'no-code';
-const DEFAULT_INSTALL_PORTAL_NAME = 'admin';
-const DEFAULT_INSTALL_PORTAL_TEMPLATE = 'git@github.com:nocobase/admin-starter.git';
-const INSTALL_DEVELOPMENT_MODES = ['no-code', 'vibe-coding'];
+const DEFAULT_INSTALL_PORTAL_TYPE = 'ai';
+const DEFAULT_INSTALL_PORTAL_NAME = 'main';
+const DEFAULT_INSTALL_PORTAL_TEMPLATE = '@nocobase/portal-template-default';
+const INSTALL_PORTAL_TYPES = ['no-code', 'ai'];
 function toOptionalPromptString(value) {
     const text = String(value ?? '').trim();
     return text || undefined;
@@ -185,8 +185,8 @@ function defaultBuiltinDbImageForDialect(value, options) {
 function defaultDbDatabaseForDialect(value) {
     return String(value ?? '').trim() === 'kingbase' ? 'kingbase' : DEFAULT_INSTALL_DB_DATABASE;
 }
-function isVibeCodingMode(values) {
-    return String(values.developmentMode ?? DEFAULT_INSTALL_DEVELOPMENT_MODE).trim() === 'vibe-coding';
+function isAiMode(values) {
+    return String(values.portalType ?? DEFAULT_INSTALL_PORTAL_TYPE).trim() === 'ai';
 }
 function supportsDbSchemaPrompt(value) {
     const dialect = String(value ?? '').trim();
@@ -412,15 +412,15 @@ export default class Install extends Command {
         'app-public-path': Flags.string({
             description: 'Public path for the local app, for example / or /console/',
         }),
-        'development-mode': Flags.string({
-            description: 'Initial development mode for the installed app',
-            options: [...INSTALL_DEVELOPMENT_MODES],
+        'portal-type': Flags.string({
+            description: 'Initial portal type for the installed app',
+            options: [...INSTALL_PORTAL_TYPES],
         }),
         'portal-name': Flags.string({
-            description: 'Initial portal name when --development-mode vibe-coding is used',
+            description: 'Initial portal name',
         }),
         'portal-template': Flags.string({
-            description: 'Initial portal template Git URL or local path when --development-mode vibe-coding is used',
+            description: 'Initial portal template npm package or local path when --portal-type ai is used',
         }),
         'root-username': Flags.string({
             description: 'Initial admin username for the installed app',
@@ -531,23 +531,23 @@ export default class Install extends Command {
                 yesInitialValue: '/',
                 validate: validateAppPublicPath,
             },
-            developmentMode: {
+            portalType: {
                 type: 'select',
-                message: installText('prompts.developmentMode.message'),
+                message: installText('prompts.portalType.message'),
                 options: [
                     {
                         value: 'no-code',
-                        label: installText('prompts.developmentMode.noCodeLabel'),
-                        hint: installText('prompts.developmentMode.noCodeHint'),
+                        label: installText('prompts.portalType.noCodeLabel'),
+                        hint: installText('prompts.portalType.noCodeHint'),
                     },
                     {
-                        value: 'vibe-coding',
-                        label: installText('prompts.developmentMode.vibeCodingLabel'),
-                        hint: installText('prompts.developmentMode.vibeCodingHint'),
+                        value: 'ai',
+                        label: installText('prompts.portalType.aiLabel'),
+                        hint: installText('prompts.portalType.aiHint'),
                     },
                 ],
-                initialValue: DEFAULT_INSTALL_DEVELOPMENT_MODE,
-                yesInitialValue: DEFAULT_INSTALL_DEVELOPMENT_MODE,
+                initialValue: DEFAULT_INSTALL_PORTAL_TYPE,
+                yesInitialValue: DEFAULT_INSTALL_PORTAL_TYPE,
                 required: true,
             },
             portalName: {
@@ -556,7 +556,6 @@ export default class Install extends Command {
                 placeholder: DEFAULT_INSTALL_PORTAL_NAME,
                 initialValue: DEFAULT_INSTALL_PORTAL_NAME,
                 yesInitialValue: DEFAULT_INSTALL_PORTAL_NAME,
-                hidden: (values) => !isVibeCodingMode(values),
                 required: true,
             },
             portalTemplate: {
@@ -564,7 +563,7 @@ export default class Install extends Command {
                 message: installText('prompts.portalTemplate.message'),
                 placeholder: DEFAULT_INSTALL_PORTAL_TEMPLATE,
                 yesInitialValue: DEFAULT_INSTALL_PORTAL_TEMPLATE,
-                hidden: (values) => !isVibeCodingMode(values),
+                hidden: (values) => !isAiMode(values),
                 required: true,
             },
         };
@@ -826,10 +825,10 @@ export default class Install extends Command {
                 preset.appPublicPath = v;
             }
         }
-        if (flags['development-mode'] !== undefined) {
-            const v = String(flags['development-mode'] ?? '').trim();
+        if (flags['portal-type'] !== undefined) {
+            const v = String(flags['portal-type'] ?? '').trim();
             if (v) {
-                preset.developmentMode = v;
+                preset.portalType = v;
             }
         }
         if (flags['portal-name'] !== undefined) {
@@ -935,7 +934,7 @@ export default class Install extends Command {
             'appPort',
             'storagePath',
             'appPublicPath',
-            'developmentMode',
+            'portalType',
             'portalName',
             'portalTemplate',
         ]);
@@ -1187,7 +1186,7 @@ export default class Install extends Command {
         const rootPassword = Install.toOptionalPromptString(config.rootPassword);
         const rootNickname = Install.toOptionalPromptString(config.rootNickname);
         const lang = Install.toOptionalPromptString(config.lang);
-        const developmentMode = Install.toOptionalPromptString(config.developmentMode);
+        const portalType = Install.toOptionalPromptString(config.portalType);
         const portalName = Install.toOptionalPromptString(config.portalName);
         const portalTemplate = Install.toOptionalPromptString(config.portalTemplate);
         const auth = config.auth;
@@ -1199,7 +1198,7 @@ export default class Install extends Command {
             ...(appPort ? { appPort } : {}),
             ...(storagePath ? { storagePath } : {}),
             ...(appPublicPath ? { appPublicPath } : {}),
-            ...(developmentMode ? { developmentMode } : {}),
+            ...(portalType ? { portalType } : {}),
             ...(portalName ? { portalName } : {}),
             ...(portalTemplate ? { portalTemplate } : {}),
             ...(hookScript ? { hookScript } : {}),
@@ -1524,7 +1523,7 @@ export default class Install extends Command {
             rootEmail: String(params.rootResults.rootEmail ?? ''),
             rootPassword: String(params.rootResults.rootPassword ?? ''),
             rootNickname: String(params.rootResults.rootNickname ?? ''),
-            developmentMode: String(params.appResults.developmentMode ?? ''),
+            portalType: String(params.appResults.portalType ?? ''),
             portalName: String(params.appResults.portalName ?? ''),
             portalTemplate: String(params.appResults.portalTemplate ?? ''),
         }, options);
@@ -1882,7 +1881,7 @@ export default class Install extends Command {
         const initEnvVars = Install.buildInitAppEnvVars({
             appResults: params.appResults,
             rootResults: params.rootResults,
-        }, { includePortal: false });
+        });
         const containerPort = resolveDockerImageContainerPort(imageRef);
         const args = [
             'run',
@@ -2159,7 +2158,7 @@ export default class Install extends Command {
             ...Install.buildInitAppEnvVars({
                 appResults: params.appResults,
                 rootResults: params.rootResults,
-            }, { includePortal: false }),
+            }),
         };
         setOptionalEnvVar(env, 'APP_PUBLIC_PATH', Install.toOptionalPromptString(params.appResults.appPublicPath));
         setOptionalEnvVar(env, 'DB_SCHEMA', optionalEnvString(params.dbResults.dbSchema));
@@ -2318,9 +2317,13 @@ export default class Install extends Command {
     }
     async saveInstalledEnv(params) {
         const defaultApiHost = await resolveDefaultApiHost();
-        await upsertEnv(params.envName, Install.buildSavedEnvConfig(params, { defaultApiHost }), {
+        const savedEnvConfig = Install.buildSavedEnvConfig(params, { defaultApiHost });
+        await upsertEnv(params.envName, savedEnvConfig, {
             scope: resolveDefaultConfigScope(),
         });
+        if (params.ensureEnvFileDefaults !== false) {
+            await ensureManagedEnvFileDefaults(params.envName, savedEnvConfig);
+        }
         await setCurrentEnv(params.envName, { scope: resolveDefaultConfigScope() });
     }
     async syncInstalledEnvConnection(params) {
@@ -2356,19 +2359,6 @@ export default class Install extends Command {
         }
         return argv;
     }
-    async prepareInitialPortalIfNeeded(params) {
-        await prepareInitialPortalTemplate({
-            developmentMode: Install.toOptionalPromptString(params.appResults.developmentMode),
-            portalName: Install.toOptionalPromptString(params.appResults.portalName),
-            portalTemplate: Install.toOptionalPromptString(params.appResults.portalTemplate),
-            npmRegistry: Install.toOptionalPromptString(params.appResults.npmRegistry),
-            storagePath: Install.resolveAbsoluteStoragePath(params.envName, params.appResults),
-            verbose: params.verbose,
-            onStartTask: (message) => this.logStage(message),
-            onSucceedTask: (message) => printInfo(message),
-            onFailTask: (message) => printWarning(message),
-        });
-    }
     async runInstallHookIfNeeded(params) {
         const appPath = Install.resolveAbsoluteAppPath(params.envName, params.appResults);
         const savedHookScript = Install.toOptionalPromptString(params.appResults.hookScript);
@@ -2412,7 +2402,7 @@ export default class Install extends Command {
         const appRootPath = Install.toOptionalPromptString(params.appResults.appRootPath);
         const storagePath = Install.toOptionalPromptString(params.appResults.storagePath);
         const appPublicPath = Install.toOptionalPromptString(params.appResults.appPublicPath);
-        const developmentMode = Install.toOptionalPromptString(params.appResults.developmentMode);
+        const portalType = Install.toOptionalPromptString(params.appResults.portalType);
         const portalName = Install.toOptionalPromptString(params.appResults.portalName);
         const portalTemplate = Install.toOptionalPromptString(params.appResults.portalTemplate);
         const derivedAppRootPath = appPath ? deriveConfiguredSourcePath(appPath) : undefined;
@@ -2449,7 +2439,7 @@ export default class Install extends Command {
             ...(appPublicPath ? { appPublicPath } : {}),
             ...(envFile ? { envFile } : {}),
             lang: params.appResults.lang,
-            developmentMode,
+            portalType,
             portalName,
             portalTemplate,
             appKey: params.appResults.appKey,
@@ -2675,6 +2665,7 @@ export default class Install extends Command {
                 dbResults,
                 rootResults,
                 envAddResults,
+                ensureEnvFileDefaults: false,
             });
             if (!parsed['skip-save-env-log']) {
                 printInfo(`Saved env config for "${envName}".`);
@@ -2742,13 +2733,6 @@ export default class Install extends Command {
                 envAddResults,
             });
         }
-        if (shouldStartApp) {
-            await this.prepareInitialPortalIfNeeded({
-                envName,
-                appResults,
-                verbose: parsed.verbose,
-            });
-        }
         if (shouldStartApp) {
             this.logStage('Starting NocoBase');
             await this.config.runCommand('app:start', this.buildAppStartArgv({ envName, verbose: parsed.verbose }));