@nocobase/cli 3.0.0-alpha.6 → 3.0.0-alpha.8

package/dist/commands/env/add.js

@@ -11,6 +11,7 @@ import { setCurrentEnv, upsertEnv } from '../../lib/auth-store.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.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 { PUBLIC_APP_CLIENT_ENTRY_MODES } from '../../lib/app-client-entry-mode.js';
 import { runPromptCatalog, } from '../../lib/prompt-catalog.js';
 import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, localeText, } from '../../lib/cli-locale.js';
 import { validateApiBaseUrl } from '../../lib/prompt-validators.js';
@@ -172,6 +173,11 @@ export default class EnvAdd extends Command {
             hidden: true,
             description: 'Docker env file saved with this env',
         }),
+        'app-client-entry-mode': Flags.string({
+            hidden: true,
+            description: 'UI entry mode saved with this env',
+            options: [...PUBLIC_APP_CLIENT_ENTRY_MODES],
+        }),
         'app-port': Flags.string({
             hidden: true,
             description: 'Application HTTP port saved with this env',

package/dist/commands/env/update.js

@@ -16,6 +16,8 @@ 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 { PUBLIC_APP_CLIENT_ENTRY_MODES } from '../../lib/app-client-entry-mode.js';
+import { upsertManagedEnvFileValues } from '../../lib/managed-env-file.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));
@@ -35,6 +37,7 @@ const UPDATE_STRING_FLAGS = [
     'app-public-path',
     'cdn-base-url',
     'env-file',
+    'app-client-entry-mode',
     'app-port',
     'app-key',
     'timezone',
@@ -68,6 +71,7 @@ const APP_RESTART_FIELDS = new Set([
     'storage-path',
     'app-public-path',
     'env-file',
+    'app-client-entry-mode',
     'app-port',
     'app-key',
     'timezone',
@@ -255,6 +259,10 @@ export default class EnvUpdate extends Command {
             hidden: true,
             description: 'Saved Docker --env-file path for this env',
         }),
+        'app-client-entry-mode': Flags.string({
+            description: 'Saved UI entry mode for this env',
+            options: [...PUBLIC_APP_CLIENT_ENTRY_MODES],
+        }),
         'app-port': Flags.string({
             description: 'Saved application HTTP port for this env',
         }),
@@ -423,6 +431,11 @@ export default class EnvUpdate extends Command {
         startTask(`Saving env config: ${envName}`);
         try {
             await replaceEnvConfig(envName, nextConfig, { scope: resolveDefaultConfigScope() });
+            if (providedFields.has('app-client-entry-mode') && nextConfig.appClientEntryMode) {
+                await upsertManagedEnvFileValues(envName, nextConfig, {
+                    APP_CLIENT_ENTRY_MODE: nextConfig.appClientEntryMode,
+                });
+            }
             succeedTask(`Saved env config for "${envName}".`);
         }
         catch (error) {

package/dist/commands/init.js

@@ -13,6 +13,7 @@ import { existsSync } from 'node:fs';
 import path from 'node:path';
 import { stdin as stdinStream, stdout as stdoutStream } from 'node:process';
 import { getEnv, upsertEnv } from "../lib/auth-store.js";
+import { defaultAppClientEntryModeForDownloadVersion, normalizePublicAppClientEntryMode, PUBLIC_APP_CLIENT_ENTRY_MODES, } from '../lib/app-client-entry-mode.js';
 import { runPromptCatalog, } from "../lib/prompt-catalog.js";
 import { applyCliLocale, localeText, translateCli } from "../lib/cli-locale.js";
 import { resolveConfiguredEnvPath, resolveDefaultConfigScope, resolveEnvRelativePath } from '../lib/cli-home.js';
@@ -47,6 +48,23 @@ const INIT_ENV_ADD_FLAG_NAMES = [
     'skip-auth',
 ];
 const initText = (key, values) => localeText(`commands.init.${key}`, values);
+const PUBLIC_APP_CLIENT_ENTRY_MODE_OPTIONS = [
+    {
+        value: 'modern-only',
+        label: initText('prompts.appClientEntryMode.modernOnlyLabel'),
+        hint: initText('prompts.appClientEntryMode.modernOnlyHint'),
+    },
+    {
+        value: 'modern-default',
+        label: initText('prompts.appClientEntryMode.modernDefaultLabel'),
+        hint: initText('prompts.appClientEntryMode.modernDefaultHint'),
+    },
+    {
+        value: 'legacy-default',
+        label: initText('prompts.appClientEntryMode.legacyDefaultLabel'),
+        hint: initText('prompts.appClientEntryMode.legacyDefaultHint'),
+    },
+];
 function withExtraHidden(def, extraHidden) {
     if (def.type === 'run') {
         return def;
@@ -106,6 +124,11 @@ function resolveInitDownloadVersion(results) {
     }
     return preset;
 }
+function resolveInitAppClientEntryMode(results, explicitValue) {
+    return (normalizePublicAppClientEntryMode(explicitValue) ??
+        normalizePublicAppClientEntryMode(results.appClientEntryMode) ??
+        defaultAppClientEntryModeForDownloadVersion(resolveInitDownloadVersion(results)));
+}
 function initVersionPromptValue(version) {
     return version === 'latest' || version === 'beta' || version === 'alpha' ? version : 'other';
 }
@@ -366,6 +389,15 @@ Prompt modes:
         source: installLikeOnly(Download.prompts.source),
         version: installLikeOnly(Download.prompts.version),
         otherVersion: installLikeOnly(Download.prompts.otherVersion),
+        appClientEntryMode: installLikeOnly({
+            type: 'select',
+            message: initText('prompts.appClientEntryMode.message'),
+            options: [...PUBLIC_APP_CLIENT_ENTRY_MODE_OPTIONS],
+            variant: 'radio',
+            hidden: (values) => resolveInitDownloadVersion(values) === 'latest',
+            initialValue: (values) => defaultAppClientEntryModeForDownloadVersion(values.version),
+            required: true,
+        }),
         dockerRegistry: installLikeOnly(Download.prompts.dockerRegistry),
         dockerPlatform: installLikeOnly(Download.prompts.dockerPlatform),
         dockerSave: installLikeDownloadExecutionOnly(Download.prompts.dockerSave),
@@ -490,6 +522,10 @@ Prompt modes:
             description: 'Skip installing NocoBase AI coding skills during init',
             default: false,
         }),
+        'app-client-entry-mode': Flags.string({
+            description: 'UI entry mode for this app env: modern-only, modern-default, or legacy-default',
+            options: [...PUBLIC_APP_CLIENT_ENTRY_MODES],
+        }),
         'ui-host': Flags.string({
             description: 'Browser-accessible host for the --ui setup page URL (default: 127.0.0.1)',
         }),
@@ -778,6 +814,7 @@ Prompt modes:
                     source: c.source,
                     version: c.version,
                     otherVersion: c.otherVersion,
+                    appClientEntryMode: c.appClientEntryMode,
                     dockerRegistry: c.dockerRegistry,
                     dockerPlatform: c.dockerPlatform,
                     dockerSave: c.dockerSave,
@@ -890,6 +927,9 @@ Prompt modes:
         if (flags['app-public-path'] !== undefined && String(flags['app-public-path']).trim() !== '') {
             preset.appPublicPath = String(flags['app-public-path']).trim();
         }
+        if (flags['app-client-entry-mode'] !== undefined && String(flags['app-client-entry-mode']).trim() !== '') {
+            preset.appClientEntryMode = String(flags['app-client-entry-mode']).trim();
+        }
         if (flags['root-username'] !== undefined) {
             preset.rootUsername = String(flags['root-username'] ?? '').trim();
         }
@@ -1027,6 +1067,7 @@ Prompt modes:
         const existingEnv = await getEnv(envName, { scope: resolveDefaultConfigScope() });
         const appPort = String(results.appPort ?? '').trim();
         const appPublicPath = String(results.appPublicPath ?? '').trim();
+        const appClientEntryMode = resolveInitAppClientEntryMode(results, flags['app-client-entry-mode']);
         const source = String(results.source ?? '').trim();
         const version = resolveInitDownloadVersion(results);
         const dockerRegistry = String(results.dockerRegistry ?? '').trim();
@@ -1100,6 +1141,7 @@ Prompt modes:
             ...(storagePath && !areConfiguredPathsEquivalent(storagePath, derivedStoragePath) ? { storagePath } : {}),
             ...(appPort ? { appPort } : {}),
             ...(appPublicPath ? { appPublicPath } : {}),
+            ...(appClientEntryMode ? { appClientEntryMode } : {}),
             ...(appKey ? { appKey } : {}),
             ...(timeZone ? { timezone: timeZone } : {}),
             ...(!skipDownload && results.devDependencies !== undefined
@@ -1228,6 +1270,13 @@ Prompt modes:
         if (appPublicPath) {
             argv.push('--app-public-path', appPublicPath);
         }
+        const appClientEntryMode = normalizePublicAppClientEntryMode(flags['app-client-entry-mode']) ||
+            (results.setupMode === 'install-new' && results.hasNocobase === undefined
+                ? resolveInitAppClientEntryMode(results)
+                : undefined);
+        if (appClientEntryMode) {
+            argv.push('--app-client-entry-mode', appClientEntryMode);
+        }
         if (flags.force) {
             argv.push('--force');
         }

package/dist/commands/install.js

@@ -25,6 +25,7 @@ import { commandOutput, commandSucceeds, ensureDockerDaemonRunning, run, runNoco
 import { printInfo, printStage, printVerbose, printWarning, setVerboseMode } from '../lib/ui.js';
 import { omitKeys, upperFirst } from "../lib/object-utils.js";
 import { clearEnvRootSetup, getEnv, setCurrentEnv, upsertEnv } from '../lib/auth-store.js';
+import { defaultAppClientEntryModeForDownloadVersion, normalizePublicAppClientEntryMode, PUBLIC_APP_CLIENT_ENTRY_MODES, } from '../lib/app-client-entry-mode.js';
 import { buildStoredEnvConfig } from '../lib/env-config.js';
 import { resolveDockerEnvFileArg } from "../lib/docker-env-file.js";
 import { startDockerLogFollower } from '../lib/docker-log-stream.js';
@@ -54,10 +55,7 @@ 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_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,9 +183,6 @@ function defaultBuiltinDbImageForDialect(value, options) {
 function defaultDbDatabaseForDialect(value) {
     return String(value ?? '').trim() === 'kingbase' ? 'kingbase' : DEFAULT_INSTALL_DB_DATABASE;
 }
-function isAiMode(values) {
-    return String(values.portalType ?? DEFAULT_INSTALL_PORTAL_TYPE).trim() === 'ai';
-}
 function supportsDbSchemaPrompt(value) {
     const dialect = String(value ?? '').trim();
     return dialect === 'postgres' || dialect === 'kingbase';
@@ -412,15 +407,12 @@ export default class Install extends Command {
         'app-public-path': Flags.string({
             description: 'Public path for the local app, for example / or /console/',
         }),
-        'portal-type': Flags.string({
-            description: 'Initial portal type for the installed app',
-            options: [...INSTALL_PORTAL_TYPES],
-        }),
-        'portal-name': Flags.string({
-            description: 'Initial portal name',
+        'app-client-entry-mode': Flags.string({
+            description: 'UI entry mode for this app env: modern-only, modern-default, or legacy-default',
+            options: [...PUBLIC_APP_CLIENT_ENTRY_MODES],
         }),
         'portal-template': Flags.string({
-            description: 'Initial portal template npm package or local path when --portal-type ai is used',
+            description: 'Template npm package or local path for the default AI Portal "main"',
         }),
         'root-username': Flags.string({
             description: 'Initial admin username for the installed app',
@@ -531,39 +523,12 @@ export default class Install extends Command {
                 yesInitialValue: '/',
                 validate: validateAppPublicPath,
             },
-            portalType: {
-                type: 'select',
-                message: installText('prompts.portalType.message'),
-                options: [
-                    {
-                        value: 'no-code',
-                        label: installText('prompts.portalType.noCodeLabel'),
-                        hint: installText('prompts.portalType.noCodeHint'),
-                    },
-                    {
-                        value: 'ai',
-                        label: installText('prompts.portalType.aiLabel'),
-                        hint: installText('prompts.portalType.aiHint'),
-                    },
-                ],
-                initialValue: DEFAULT_INSTALL_PORTAL_TYPE,
-                yesInitialValue: DEFAULT_INSTALL_PORTAL_TYPE,
-                required: true,
-            },
-            portalName: {
-                type: 'text',
-                message: installText('prompts.portalName.message'),
-                placeholder: DEFAULT_INSTALL_PORTAL_NAME,
-                initialValue: DEFAULT_INSTALL_PORTAL_NAME,
-                yesInitialValue: DEFAULT_INSTALL_PORTAL_NAME,
-                required: true,
-            },
             portalTemplate: {
                 type: 'text',
                 message: installText('prompts.portalTemplate.message'),
                 placeholder: DEFAULT_INSTALL_PORTAL_TEMPLATE,
+                initialValue: DEFAULT_INSTALL_PORTAL_TEMPLATE,
                 yesInitialValue: DEFAULT_INSTALL_PORTAL_TEMPLATE,
-                hidden: (values) => !isAiMode(values),
                 required: true,
             },
         };
@@ -825,16 +790,10 @@ export default class Install extends Command {
                 preset.appPublicPath = v;
             }
         }
-        if (flags['portal-type'] !== undefined) {
-            const v = String(flags['portal-type'] ?? '').trim();
-            if (v) {
-                preset.portalType = v;
-            }
-        }
-        if (flags['portal-name'] !== undefined) {
-            const v = String(flags['portal-name'] ?? '').trim();
+        if (flags['app-client-entry-mode'] !== undefined) {
+            const v = normalizePublicAppClientEntryMode(flags['app-client-entry-mode']);
             if (v) {
-                preset.portalName = v;
+                preset.appClientEntryMode = v;
             }
         }
         if (flags['portal-template'] !== undefined) {
@@ -934,8 +893,7 @@ export default class Install extends Command {
             'appPort',
             'storagePath',
             'appPublicPath',
-            'portalType',
-            'portalName',
+            'appClientEntryMode',
             'portalTemplate',
         ]);
     }
@@ -1186,8 +1144,6 @@ 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 portalType = Install.toOptionalPromptString(config.portalType);
-        const portalName = Install.toOptionalPromptString(config.portalName);
         const portalTemplate = Install.toOptionalPromptString(config.portalTemplate);
         const auth = config.auth;
         const savedAuthType = Install.toOptionalPromptString(config.authType) ?? Install.toOptionalPromptString(auth?.type);
@@ -1198,8 +1154,6 @@ export default class Install extends Command {
             ...(appPort ? { appPort } : {}),
             ...(storagePath ? { storagePath } : {}),
             ...(appPublicPath ? { appPublicPath } : {}),
-            ...(portalType ? { portalType } : {}),
-            ...(portalName ? { portalName } : {}),
             ...(portalTemplate ? { portalTemplate } : {}),
             ...(hookScript ? { hookScript } : {}),
         };
@@ -1523,8 +1477,6 @@ export default class Install extends Command {
             rootEmail: String(params.rootResults.rootEmail ?? ''),
             rootPassword: String(params.rootResults.rootPassword ?? ''),
             rootNickname: String(params.rootResults.rootNickname ?? ''),
-            portalType: String(params.appResults.portalType ?? ''),
-            portalName: String(params.appResults.portalName ?? ''),
             portalTemplate: String(params.appResults.portalTemplate ?? ''),
         }, options);
     }
@@ -1874,6 +1826,7 @@ export default class Install extends Command {
         const extractClientAssets = resolveExtractClientAssetsDefaultEnabled(process.env.NOCOBASE_EXTRACT_CLIENT_ASSETS);
         const appKey = Install.resolveManagedAppKey(params.appResults.appKey);
         const appPublicPath = Install.toOptionalPromptString(params.appResults.appPublicPath);
+        const appClientEntryMode = Install.toOptionalPromptString(params.appResults.appClientEntryMode);
         const timeZone = Install.resolveManagedTimeZone(params.appResults.timeZone);
         const containerName = Install.buildDockerAppContainerName(params.envName, params.dockerContainerPrefix ?? params.workspaceName);
         const configuredEnvFile = String(params.appResults.envFile ?? '').trim();
@@ -1901,6 +1854,7 @@ export default class Install extends Command {
         }
         args.push('-e', `APP_KEY=${appKey}`, '-e', `DB_DIALECT=${dbDialect}`, '-e', `DB_HOST=${dbHost}`, '-e', `DB_PORT=${dbPort}`, '-e', `DB_DATABASE=${dbDatabase}`, '-e', `DB_USER=${dbUser}`, '-e', `DB_PASSWORD=${dbPassword}`, '-e', `TZ=${timeZone}`, '-v', `${storagePath}:/app/nocobase/storage`);
         pushOptionalEnvArg(args, 'APP_PUBLIC_PATH', appPublicPath);
+        pushOptionalEnvArg(args, 'APP_CLIENT_ENTRY_MODE', appClientEntryMode);
         pushOptionalEnvArg(args, 'DB_SCHEMA', dbSchema);
         pushOptionalEnvArg(args, 'DB_TABLE_PREFIX', dbTablePrefix);
         pushOptionalEnvArg(args, 'DB_UNDERSCORED', dbUnderscored);
@@ -2161,6 +2115,7 @@ export default class Install extends Command {
             }),
         };
         setOptionalEnvVar(env, 'APP_PUBLIC_PATH', Install.toOptionalPromptString(params.appResults.appPublicPath));
+        setOptionalEnvVar(env, 'APP_CLIENT_ENTRY_MODE', Install.toOptionalPromptString(params.appResults.appClientEntryMode));
         setOptionalEnvVar(env, 'DB_SCHEMA', optionalEnvString(params.dbResults.dbSchema));
         setOptionalEnvVar(env, 'DB_TABLE_PREFIX', optionalEnvString(params.dbResults.dbTablePrefix));
         setOptionalEnvVar(env, 'DB_UNDERSCORED', optionalEnvBoolean(params.dbResults.dbUnderscored));
@@ -2402,8 +2357,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 portalType = Install.toOptionalPromptString(params.appResults.portalType);
-        const portalName = Install.toOptionalPromptString(params.appResults.portalName);
+        const appClientEntryMode = Install.toOptionalPromptString(params.appResults.appClientEntryMode);
         const portalTemplate = Install.toOptionalPromptString(params.appResults.portalTemplate);
         const derivedAppRootPath = appPath ? deriveConfiguredSourcePath(appPath) : undefined;
         const derivedStoragePath = appPath ? deriveConfiguredStoragePath(appPath) : undefined;
@@ -2437,10 +2391,9 @@ export default class Install extends Command {
             appPort,
             ...(storagePath && !areConfiguredPathsEquivalent(storagePath, derivedStoragePath) ? { storagePath } : {}),
             ...(appPublicPath ? { appPublicPath } : {}),
+            ...(appClientEntryMode ? { appClientEntryMode } : {}),
             ...(envFile ? { envFile } : {}),
             lang: params.appResults.lang,
-            portalType,
-            portalName,
             portalTemplate,
             appKey: params.appResults.appKey,
             timezone: params.appResults.timeZone,
@@ -2512,6 +2465,9 @@ export default class Install extends Command {
         };
         downloadOpts.yes = yes;
         const downloadResults = await runPromptCatalog(Download.prompts, downloadOpts);
+        appResults.appClientEntryMode =
+            normalizePublicAppClientEntryMode(appResults.appClientEntryMode) ??
+                defaultAppClientEntryModeForDownloadVersion(downloadResultsValue(downloadResults, 'version'));
         if (parsed['skip-download']) {
             delete downloadResults.outputDir;
             delete downloadResults.replace;

package/dist/lib/app-client-entry-mode.js

@@ -0,0 +1,28 @@
+/**
+ * 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.
+ */
+export const APP_CLIENT_ENTRY_MODES = [
+    'legacy-default',
+    'modern-default',
+    'modern-only',
+    'settings-default',
+];
+export const PUBLIC_APP_CLIENT_ENTRY_MODES = ['legacy-default', 'modern-default', 'modern-only'];
+export function normalizeAppClientEntryMode(value) {
+    const text = String(value ?? '').trim();
+    return APP_CLIENT_ENTRY_MODES.includes(text) ? text : undefined;
+}
+export function normalizePublicAppClientEntryMode(value) {
+    const text = String(value ?? '').trim();
+    return PUBLIC_APP_CLIENT_ENTRY_MODES.includes(text)
+        ? text
+        : undefined;
+}
+export function defaultAppClientEntryModeForDownloadVersion(version) {
+    return String(version ?? '').trim() === 'latest' ? 'legacy-default' : 'modern-only';
+}

package/dist/lib/app-managed-resources.js

@@ -186,6 +186,7 @@ export async function buildSavedDockerRunArgs(runtime, options) {
     const dbTablePrefix = trimValue(config.dbTablePrefix);
     const dbUnderscored = typeof config.dbUnderscored === 'boolean' ? config.dbUnderscored : undefined;
     const extractClientAssets = resolveDockerClientAssetsExtractEnabled(process.env.NOCOBASE_EXTRACT_CLIENT_ASSETS);
+    const appClientEntryMode = trimValue(config.appClientEntryMode);
     const dockerRegistry = trimValue(config.dockerRegistry) || DEFAULT_DOCKER_REGISTRY;
     const version = trimValue(config.downloadVersion) || DEFAULT_DOCKER_VERSION;
     const imageRef = resolveDockerImageRef(dockerRegistry, version, {
@@ -245,6 +246,7 @@ export async function buildSavedDockerRunArgs(runtime, options) {
     const lifecycleEnvVars = managedAppLifecycleEnvVars();
     args.push('-e', `APP_ENV=${lifecycleEnvVars.APP_ENV}`, '-e', `NODE_ENV=${lifecycleEnvVars.NODE_ENV}`, '-e', `APP_KEY=${appKey}`, '-e', `DB_DIALECT=${dbDialect}`, '-e', `DB_HOST=${dbHost}`, '-e', `DB_PORT=${dbPort}`, '-e', `DB_DATABASE=${dbDatabase}`, '-e', `DB_USER=${dbUser}`, '-e', `DB_PASSWORD=${dbPassword}`, '-e', `TZ=${timeZone}`, '-v', `${storagePath}:${DOCKER_APP_STORAGE_DESTINATION}`);
     pushOptionalEnvArg(args, 'APP_PUBLIC_PATH', appPublicPath ? resolveAppPublicPath(appPublicPath) : undefined);
+    pushOptionalEnvArg(args, 'APP_CLIENT_ENTRY_MODE', appClientEntryMode);
     pushOptionalEnvArg(args, 'DB_SCHEMA', dbSchema || undefined);
     pushOptionalEnvArg(args, 'DB_TABLE_PREFIX', dbTablePrefix || undefined);
     pushOptionalEnvArg(args, 'DB_UNDERSCORED', dbUnderscored);

package/dist/lib/auth-store.js

@@ -335,6 +335,7 @@ export class Env {
         put('APP_PORT', this.appPort);
         put('APP_PUBLIC_PATH', this.config.appPublicPath ? resolveAppPublicPath(this.config.appPublicPath) : undefined);
         put('CDN_BASE_URL', this.config.cdnBaseUrl);
+        put('APP_CLIENT_ENTRY_MODE', this.config.appClientEntryMode);
         put('APP_KEY', this.config.appKey);
         put('TZ', this.config.timezone);
         put('DB_DIALECT', this.config.dbDialect);

package/dist/lib/env-auth.js

@@ -27,40 +27,6 @@ const DEFAULT_DEVICE_POLL_INTERVAL_SECONDS = 5;
 function normalizeBaseUrl(baseUrl) {
     return baseUrl.replace(/\/+$/, '');
 }
-function buildDeviceVerificationPathFromApiBaseUrl(apiBaseUrl) {
-    const url = new URL(apiBaseUrl);
-    const subappMatch = url.pathname.match(/^(.*)\/api\/__app\/([^/]+)\/?$/);
-    if (subappMatch) {
-        const publicPath = (subappMatch[1] || '').replace(/\/+$/, '');
-        return `${publicPath}/settings/apps/${subappMatch[2]}/idpOAuth/device`;
-    }
-    const appMatch = url.pathname.match(/^(.*)\/api\/?$/);
-    if (appMatch) {
-        const publicPath = (appMatch[1] || '').replace(/\/+$/, '');
-        return `${publicPath}/settings/idpOAuth/device`;
-    }
-    return undefined;
-}
-export function resolveDeviceVerificationUrlForApiBaseUrl(verificationUrl, apiBaseUrl) {
-    try {
-        const devicePath = buildDeviceVerificationPathFromApiBaseUrl(apiBaseUrl);
-        if (!devicePath) {
-            return verificationUrl;
-        }
-        const originalUrl = new URL(verificationUrl);
-        if (!originalUrl.pathname.endsWith('/idpOAuth/device')) {
-            return verificationUrl;
-        }
-        const publicUrl = new URL(apiBaseUrl);
-        publicUrl.pathname = devicePath;
-        publicUrl.search = originalUrl.search;
-        publicUrl.hash = originalUrl.hash;
-        return publicUrl.toString();
-    }
-    catch {
-        return verificationUrl;
-    }
-}
 export function getOauthMetadataUrl(baseUrl) {
     return `${normalizeBaseUrl(baseUrl)}/.well-known/oauth-authorization-server`;
 }
@@ -1051,7 +1017,7 @@ async function authenticateEnvWithOauthDevice(options) {
             baseUrl: options.baseUrl,
         });
         stopTask();
-        const verificationUrl = resolveDeviceVerificationUrlForApiBaseUrl(deviceAuthorization.verification_uri_complete || deviceAuthorization.verification_uri, options.baseUrl);
+        const verificationUrl = deviceAuthorization.verification_uri_complete || deviceAuthorization.verification_uri;
         const browser = await browserOpener(verificationUrl);
         cleanupBrowserOpenTarget = browser.cleanup;
         if (!browser.opened) {

package/dist/lib/env-command-config.js

@@ -19,6 +19,7 @@ export const ENV_STRING_CONFIG_FLAG_MAP = {
     'app-public-path': 'appPublicPath',
     'cdn-base-url': 'cdnBaseUrl',
     'env-file': 'envFile',
+    'app-client-entry-mode': 'appClientEntryMode',
     'app-port': 'appPort',
     'app-key': 'appKey',
     timezone: 'timezone',

package/dist/lib/env-config.js

@@ -6,6 +6,7 @@
  * 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 { normalizeAppClientEntryMode } from './app-client-entry-mode.js';
 import { normalizeEnvProxyConfig } from './env-proxy-config.js';
 import { resolveAppPublicPath } from './app-public-path.js';
 import { normalizeEnvPortalsConfig } from './env-portal-config.js';
@@ -37,8 +38,6 @@ const STRING_ENV_CONFIG_KEYS = [
     'dbSchema',
     'dbTablePrefix',
     'lang',
-    'portalType',
-    'portalName',
     'portalTemplate',
     'rootUsername',
     'rootEmail',
@@ -87,6 +86,10 @@ export function buildStoredEnvConfig(input) {
             envConfig[key] = key === 'appPublicPath' ? resolveAppPublicPath(value) : value;
         }
     }
+    const appClientEntryMode = normalizeAppClientEntryMode(input.appClientEntryMode);
+    if (appClientEntryMode) {
+        envConfig.appClientEntryMode = appClientEntryMode;
+    }
     const setupState = resolveSetupState(input.setupState);
     if (setupState) {
         envConfig.setupState = setupState;

package/dist/lib/env-proxy.js

@@ -22,7 +22,7 @@ const DEFAULT_PLUGIN_STATICS_PATH = '/static/plugins/';
 const DEFAULT_MODERN_CLIENT_PREFIX = 'v';
 const SETTINGS_CLIENT_PREFIX = 'settings';
 const DEFAULT_APP_CLIENT_ENTRY_MODE = 'legacy-default';
-const APP_CLIENT_ENTRY_MODES = new Set(['legacy-default', 'modern-default', 'modern-only']);
+const APP_CLIENT_ENTRY_MODES = new Set(['legacy-default', 'modern-default', 'modern-only', 'settings-default']);
 const DEFAULT_API_CLIENT_STORAGE_PREFIX = 'NOCOBASE_';
 const DEFAULT_API_CLIENT_STORAGE_TYPE = 'localStorage';
 const DEFAULT_ESM_CDN_BASE_URL = 'https://esm.sh';

package/dist/lib/managed-env-file.js

@@ -8,6 +8,7 @@
  */
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import path from 'node:path';
+import { normalizeAppClientEntryMode } from './app-client-entry-mode.js';
 import { resolveEnvKind } from './auth-store.js';
 import { resolveConfiguredEnvPath } from './cli-home.js';
 import { resolveDockerEnvFileArg, resolveDockerEnvFilePath } from "./docker-env-file.js";
@@ -17,6 +18,14 @@ export const DEFAULT_MANAGED_ENV_FILE_VALUES = {
     APP_PROCESS_ADAPTER: 'local',
     APP_CLIENT_ENTRY_MODE: 'modern-only',
 };
+function buildManagedEnvFileDefaults(config, defaults = DEFAULT_MANAGED_ENV_FILE_VALUES) {
+    return {
+        ...defaults,
+        APP_CLIENT_ENTRY_MODE: normalizeAppClientEntryMode(config?.appClientEntryMode) ??
+            trimValue(defaults.APP_CLIENT_ENTRY_MODE) ??
+            DEFAULT_MANAGED_ENV_FILE_VALUES.APP_CLIENT_ENTRY_MODE,
+    };
+}
 function trimValue(value) {
     const text = String(value ?? '').trim();
     return text || undefined;
@@ -36,6 +45,29 @@ function stripWrappingQuotes(value) {
     }
     return value;
 }
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+function upsertSimpleEnvContent(content, values) {
+    let nextContent = content;
+    const missingEntries = new Map(Object.entries(values).filter(([, value]) => trimValue(value)));
+    for (const key of Array.from(missingEntries.keys())) {
+        const pattern = new RegExp(`^\\s*(?:export\\s+)?${escapeRegExp(key)}\\s*=.*$`, 'gm');
+        if (!pattern.test(nextContent)) {
+            continue;
+        }
+        nextContent = nextContent.replace(pattern, `${key}=${values[key]}`);
+        missingEntries.delete(key);
+    }
+    if (missingEntries.size === 0) {
+        return nextContent;
+    }
+    const separator = nextContent && !nextContent.endsWith('\n') ? '\n' : '';
+    const appended = Array.from(missingEntries.entries())
+        .map(([key, value]) => `${key}=${value}`)
+        .join('\n');
+    return `${nextContent}${separator}${appended}\n`;
+}
 export function parseSimpleEnvFile(content) {
     const values = {};
     for (const rawLine of content.split(/\r?\n/)) {
@@ -112,7 +144,8 @@ export async function ensureManagedEnvFileDefaults(envName, config, defaults = D
         }
     }
     const existing = parseSimpleEnvFile(content);
-    const missingEntries = Object.entries(defaults).filter(([key, value]) => trimValue(value) && !existing[key]);
+    const resolvedDefaults = buildManagedEnvFileDefaults(config, defaults);
+    const missingEntries = Object.entries(resolvedDefaults).filter(([key, value]) => trimValue(value) && !existing[key]);
     if (missingEntries.length === 0) {
         return envFilePath;
     }
@@ -122,6 +155,29 @@ export async function ensureManagedEnvFileDefaults(envName, config, defaults = D
     await writeFile(envFilePath, nextContent, 'utf8');
     return envFilePath;
 }
+export async function upsertManagedEnvFileValues(envName, config, values) {
+    const envFilePath = resolveManagedEnvFilePathFromConfig(envName, config);
+    if (!envFilePath) {
+        return undefined;
+    }
+    let content = '';
+    try {
+        content = await readFile(envFilePath, 'utf8');
+    }
+    catch (error) {
+        const code = error && typeof error === 'object' && 'code' in error ? String(error.code) : '';
+        if (code !== 'ENOENT') {
+            throw error;
+        }
+    }
+    const nextContent = upsertSimpleEnvContent(content, values);
+    if (nextContent === content) {
+        return envFilePath;
+    }
+    await mkdir(path.dirname(envFilePath), { recursive: true });
+    await writeFile(envFilePath, nextContent, 'utf8');
+    return envFilePath;
+}
 export async function resolveManagedRuntimeEnvFilePath(runtime) {
     if (runtime.kind === 'local') {
         return resolveManagedLocalEnvFilePath(runtime);

package/dist/lib/managed-init-env.js

@@ -29,8 +29,6 @@ export function buildInitAppEnvVarsFromConfig(config, options = {}) {
     put('INIT_ROOT_PASSWORD', config?.rootPassword);
     put('INIT_ROOT_NICKNAME', config?.rootNickname);
     if (options.includePortal !== false) {
-        put('INIT_PORTAL_TYPE', config?.portalType);
-        put('INIT_PORTAL_NAME', config?.portalName);
         put('INIT_PORTAL_TEMPLATE', config?.portalTemplate);
     }
     return out;

package/dist/lib/portal-source.js

@@ -24,6 +24,10 @@ import { listPortalWorkspaces } from './portal-list.js';
 import { findPortalListItem } from './portal-info.js';
 import { resolvePnpmInstallCommand, run, runPnpmInstallCommand } from './run-npm.js';
 const execFileAsync = promisify(execFile);
+const NOCOBASE_CLI_GIT_IDENTITY = {
+    name: 'NocoBase CLI',
+    email: '314549027+nocobase-cli@users.noreply.github.com',
+};
 const portalSourceText = (key, values, fallback) => translateCli(`commands.portalSource.${key}`, values, { fallback });
 const PULL_SOURCE_OPERATION = {
     method: 'POST',
@@ -215,6 +219,33 @@ async function runGit(args, cwd) {
         maxBuffer: 10 * 1024 * 1024,
     });
 }
+function isValidGitIdentity(identity) {
+    return (!/[\r\n<>]/.test(identity.name) &&
+        !/[\r\n<>\s]/.test(identity.email) &&
+        identity.email.includes('@'));
+}
+async function resolveLocalGitIdentity(cwd) {
+    let output;
+    try {
+        output = (await runGit(['var', 'GIT_AUTHOR_IDENT'], cwd)).stdout;
+    }
+    catch {
+        return undefined;
+    }
+    const match = /^(.*) <([^<>]+)> -?\d+ [+-]\d{4}$/.exec(trimValue(output));
+    if (!match) {
+        return undefined;
+    }
+    const identity = { name: match[1], email: match[2] };
+    if (!isValidGitIdentity(identity)) {
+        return undefined;
+    }
+    if (identity.name === NOCOBASE_CLI_GIT_IDENTITY.name &&
+        identity.email === NOCOBASE_CLI_GIT_IDENTITY.email) {
+        return undefined;
+    }
+    return identity;
+}
 async function installPortalDependencies(params) {
     if (params.installDependencies === false) {
         return {
@@ -488,6 +519,7 @@ async function pullGitPortalSource(params) {
 }
 async function pushGitPortalSource(params) {
     const git = assertGitSourceConfig(params.context);
+    const localIdentity = await resolveLocalGitIdentity(params.context.portalDir);
     const tempDir = await mkdtemp(path.join(os.tmpdir(), 'nocobase-cli-portal-git-push-'));
     try {
         const repoDir = await cloneGitSource({
@@ -506,15 +538,20 @@ async function pushGitPortalSource(params) {
         if (!status.stdout.trim()) {
             return undefined;
         }
-        await runGit([
+        const commitIdentity = localIdentity ?? NOCOBASE_CLI_GIT_IDENTITY;
+        const commitArgs = [
             '-c',
-            'user.name=NocoBase CLI',
+            `user.name=${commitIdentity.name}`,
             '-c',
-            'user.email=nocobase-cli@localhost',
+            `user.email=${commitIdentity.email}`,
             'commit',
             '-m',
             trimValue(params.message) || `chore(portal): update ${params.context.portal}`,
-        ], repoDir);
+        ];
+        if (localIdentity) {
+            commitArgs.push('-m', `Co-authored-by: ${NOCOBASE_CLI_GIT_IDENTITY.name} <${NOCOBASE_CLI_GIT_IDENTITY.email}>`);
+        }
+        await runGit(commitArgs, repoDir);
         await runGit(['push', 'origin', git.branch], repoDir);
         const revision = await runGit(['rev-parse', 'HEAD'], repoDir);
         return revision.stdout.trim();

package/dist/lib/prompt-catalog-core.js

@@ -60,7 +60,7 @@ export function mergedBoolean(key, def, iv, useYesInitial) {
     }
     return def.initialValue ?? true;
 }
-export function mergedSelect(key, def, iv, useYesInitial) {
+export function mergedSelect(key, def, iv, useYesInitial, valuesSoFar = {}) {
     const enabledValueList = enabledSelectOptionValues(def.options);
     if (hasIvKey(iv, key)) {
         const s = String(iv[key]);
@@ -72,7 +72,7 @@ export function mergedSelect(key, def, iv, useYesInitial) {
     if (useYesInitial && def.yesInitialValue !== undefined && enabledValueList.includes(def.yesInitialValue)) {
         return def.yesInitialValue;
     }
-    const d = def.initialValue;
+    const d = typeof def.initialValue === 'function' ? def.initialValue(valuesSoFar) : def.initialValue;
     if (d !== undefined && enabledValueList.includes(d)) {
         return d;
     }

package/dist/lib/prompt-catalog-terminal.js

@@ -221,11 +221,12 @@ export async function runPromptCatalog(catalog, options = {}) {
         if (def.type === 'select') {
             const message = resolvePromptText(def.message, locale, key);
             const valueList = selectOptionValues(def.options);
+            const valuesSoFar = { ...computationSeed, ...out };
             if (def.required && def.options.length === 0) {
                 hooks.onMissingNonInteractive(t('promptCatalog.nonInteractive.selectRequiredNoOptions', { key }));
             }
             if (!interactive) {
-                const merged = mergedSelect(key, def, resolveIv, useYesInitial);
+                const merged = mergedSelect(key, def, resolveIv, useYesInitial, valuesSoFar);
                 if (merged === undefined || !valueList.includes(merged)) {
                     const bad = hasIvKey(resolveIv, key) && !valueList.includes(String(resolveIv[key]))
                         ? String(resolveIv[key])
@@ -243,10 +244,8 @@ export async function runPromptCatalog(catalog, options = {}) {
                 }
                 continue;
             }
-            const merged = mergedSelect(key, def, promptIv, false);
-            const uiInitial = merged ??
-                (def.initialValue && valueList.includes(def.initialValue) ? def.initialValue : undefined) ??
-                valueList[0];
+            const merged = mergedSelect(key, def, promptIv, false, valuesSoFar);
+            const uiInitial = merged ?? valueList[0];
             if (uiInitial === undefined || !valueList.includes(uiInitial)) {
                 const hint = def.required
                     ? t('promptCatalog.nonInteractive.selectRequiredInteractive', { key })

package/dist/lib/prompt-web-ui.js

@@ -34,6 +34,13 @@ function resolveTextDefault(def, out) {
     }
     return String(iv ?? '');
 }
+function resolveSelectDefault(def, out) {
+    const iv = def.initialValue;
+    if (typeof iv === 'function') {
+        return iv(out);
+    }
+    return iv;
+}
 function resolvePasswordDefault(def, out) {
     const iv = def.initialValue;
     if (typeof iv === 'function') {
@@ -98,7 +105,7 @@ function defaultValueForInput(key, def, out) {
             const first = def.options
                 .find((o) => typeof o === 'string' || o.disabled !== true);
             const firstValue = typeof first === 'string' ? first : first?.value;
-            const i = def.initialValue;
+            const i = resolveSelectDefault(def, out);
             const enabledValues = def.options
                 .filter((o) => typeof o === 'string' || o.disabled !== true)
                 .map((o) => (typeof o === 'string' ? o : o.value));

package/dist/locale/en-US.json

@@ -468,7 +468,7 @@
           "betaLabel": "beta",
           "betaHint": "Preview release. Good for trying upcoming features before general release.",
           "alphaLabel": "alpha",
-          "alphaHint": "Development release. Includes the newest changes, but may be incomplete or unstable.",
+          "alphaHint": "Choose this version to try the new features in 3.0.",
           "otherLabel": "Other",
           "otherHint": "Enter another package version, Docker tag, or Git ref manually, such as a branch name."
         },
@@ -657,6 +657,15 @@
         "skipDownload": {
           "message": "Skip downloading NocoBase and reuse existing local app files or Docker images"
         },
+        "appClientEntryMode": {
+          "message": "App client entry mode",
+          "modernOnlyLabel": "Modern UI only",
+          "modernOnlyHint": "Only the modern UI is available; the legacy UI cannot be accessed.",
+          "modernDefaultLabel": "Modern UI by default",
+          "modernDefaultHint": "Open the modern UI by default while keeping the legacy UI available.",
+          "legacyDefaultLabel": "Legacy UI by default",
+          "legacyDefaultHint": "Open the legacy UI by default while keeping the modern UI available."
+        },
         "portalType": {
           "message": "Portal type",
           "noCodeLabel": "No-code portal",

package/dist/locale/zh-CN.json

@@ -468,7 +468,7 @@
           "betaLabel": "beta",
           "betaHint": "测试版。包含即将发布的新功能，适合提前体验和反馈。",
           "alphaLabel": "alpha",
-          "alphaHint": "开发版。功能更新最快，但可能不完整或不稳定。",
+          "alphaHint": "如果要体验 3.0 新功能，选择这个版本。",
           "otherLabel": "其他",
           "otherHint": "手动填写其他版本号、Docker tag 或 Git ref，例如分支名。"
         },
@@ -657,6 +657,15 @@
         "skipDownload": {
           "message": "跳过下载 NocoBase，直接复用已有的本地应用文件或 Docker 镜像"
         },
+        "appClientEntryMode": {
+          "message": "应用界面入口",
+          "modernOnlyLabel": "仅使用新版界面",
+          "modernOnlyHint": "只能进入新版界面，不可进入旧版界面。",
+          "modernDefaultLabel": "默认进入新版界面",
+          "modernDefaultHint": "默认进入新版界面，同时保留旧版界面入口。",
+          "legacyDefaultLabel": "默认进入旧版界面",
+          "legacyDefaultHint": "默认进入旧版界面，也可以进入新版界面。"
+        },
         "portalType": {
           "message": "Portal 类型",
           "noCodeLabel": "无代码 Portal",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "3.0.0-alpha.6",
+  "version": "3.0.0-alpha.8",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -147,5 +147,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "3508eabe683b9a47a28d0f3425098eb58873a9d7"
+  "gitHead": "ce017f3deb8b2414c6b13818042c4187270d1d8a"
 }