@nocobase/cli 2.2.0-alpha.10 → 2.2.0-alpha.12

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_PORTAL_TYPE = 'no-code';
-const DEFAULT_INIT_PORTAL_NAME = 'admin';
-const DEFAULT_INIT_PORTAL_TEMPLATE = '@nocobase/portal-template-default';
 const DOWNLOAD_OUTPUT_DIR_PROMPT = Download.prompts.outputDir;
 const INIT_SETUP_MODES = ['install-new', 'manage-local', 'connect-remote'];
-const INIT_PORTAL_TYPES = ['no-code', 'ai'];
 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 isAiMode(values) {
-    return String(values.portalType ?? DEFAULT_INIT_PORTAL_TYPE).trim() === 'ai';
-}
 function remoteConnectionOnly(def) {
     return withExtraHidden(def, (values) => !isRemoteSetupMode(values));
 }
@@ -394,42 +388,6 @@ Prompt modes:
         devDependencies: installLikeDownloadExecutionOnly(Download.prompts.devDependencies),
         build: installLikeDownloadExecutionOnly(Download.prompts.build),
         buildDts: installLikeDownloadExecutionOnly(Download.prompts.buildDts),
-        portalType: installNewOnly({
-            type: 'select',
-            variant: 'radio',
-            message: initText('prompts.portalType.message'),
-            options: [
-                {
-                    value: 'no-code',
-                    label: initText('prompts.portalType.noCodeLabel'),
-                    hint: initText('prompts.portalType.noCodeHint'),
-                },
-                {
-                    value: 'ai',
-                    label: initText('prompts.portalType.aiLabel'),
-                    hint: initText('prompts.portalType.aiHint'),
-                },
-            ],
-            initialValue: DEFAULT_INIT_PORTAL_TYPE,
-            yesInitialValue: DEFAULT_INIT_PORTAL_TYPE,
-            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,
-            required: true,
-        }),
-        portalTemplate: installNewOnly({
-            type: 'text',
-            message: initText('prompts.portalTemplate.message'),
-            placeholder: DEFAULT_INIT_PORTAL_TEMPLATE,
-            yesInitialValue: DEFAULT_INIT_PORTAL_TEMPLATE,
-            hidden: (values) => !isAiMode(values),
-            required: true,
-        }),
         dbDialect: installLikeOnly(Install.dbPrompts.dbDialect),
         builtinDb: installLikeOnly(Install.dbPrompts.builtinDb),
         builtinDbImage: installLikeOnly(Install.dbPrompts.builtinDbImage),
@@ -455,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,
@@ -511,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],
         }),
-        'portal-type': Flags.string({
-            description: 'Initial portal type: no-code or ai',
-            options: [...INIT_PORTAL_TYPES],
-        }),
-        'portal-name': Flags.string({
-            description: 'Initial portal name',
-        }),
-        'portal-template': Flags.string({
-            description: 'Initial portal template npm package or local path when --portal-type ai is used',
-        }),
         ui: Flags.boolean({
             description: 'Open the guided setup flow in a local browser form (not valid with --yes)',
             default: false,
@@ -638,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),
@@ -668,7 +608,7 @@ Prompt modes:
                     ? { setupMode: normalizeInitSetupMode(presetValues.hasNocobase) }
                     : {}),
             },
-            yesInitialValues: pickKeys(dynamicInitialValues, ['portalTemplate']),
+            yesInitialValues: {},
             values: presetValues,
             yes: normalizedFlags.yes || useBrowserUi || !interactive,
             hooks: {
@@ -741,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(),
@@ -751,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')) {
@@ -843,14 +774,6 @@ Prompt modes:
                     buildDts: c.buildDts,
                 },
             },
-            {
-                sectionTitle: initText('webUi.portalType.title'),
-                sectionDescription: initText('webUi.portalType.description'),
-                catalog: {
-                    portalName: c.portalName,
-                    portalType: c.portalType,
-                },
-            },
             {
                 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['portal-type'] !== undefined && String(flags['portal-type']).trim() !== '') {
-            preset.portalType = String(flags['portal-type']).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 portalType = String(results.portalType ?? '').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 } : {}),
-            ...(portalType && portalType !== DEFAULT_INIT_PORTAL_TYPE ? { portalType } : {}),
-            ...(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 portalType = String(results.portalType ?? '').trim();
-        if (portalType && portalType !== DEFAULT_INIT_PORTAL_TYPE) {
-            argv.push('--portal-type', portalType);
-        }
-        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,15 +1409,6 @@ Prompt modes:
             delete normalized.rootPassword;
             delete normalized.rootNickname;
         }
-        const portalType = normalizeConnectionString(normalized.portalType) || DEFAULT_INIT_PORTAL_TYPE;
-        normalized.portalType = portalType;
-        normalized.portalName = normalizeConnectionString(normalized.portalName) || DEFAULT_INIT_PORTAL_NAME;
-        if (portalType === 'ai') {
-            normalized.portalTemplate = normalizeConnectionString(normalized.portalTemplate);
-        }
-        else {
-            delete normalized.portalTemplate;
-        }
         delete normalized.installApiBaseUrl;
         delete normalized.installAuthType;
         delete normalized.installUsername;

package/dist/commands/install.js

@@ -29,6 +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 { 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';
@@ -53,8 +54,8 @@ 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 = 'no-code';
-const DEFAULT_INSTALL_PORTAL_NAME = 'admin';
+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) {
@@ -2316,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) {
@@ -2660,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}".`);

package/dist/commands/portal/create.js

@@ -16,7 +16,7 @@ import { printInfo, printSuccess } from '../../lib/ui.js';
 const DEFAULT_PORTAL_TEMPLATE = '@nocobase/portal-template-default';
 const portalCreateText = (key, values, fallback) => translateCli(`commands.portalCreate.${key}`, values, { fallback });
 export default class PortalCreate extends Command {
-    static summary = 'Create a local portal from a template';
+    static summary = 'Create a local AI portal from a template';
     static examples = [
         '<%= config.bin %> <%= command.id %> customer',
         '<%= config.bin %> <%= command.id %> customer --template @nocobase/portal-template-default',
@@ -26,7 +26,7 @@ export default class PortalCreate extends Command {
     static args = {
         portal: Args.string({
             required: true,
-            description: 'Portal name',
+            description: 'AI Portal name',
         }),
     };
     static flags = {
@@ -76,7 +76,8 @@ export default class PortalCreate extends Command {
         if (!confirmed) {
             return;
         }
-        const env = await getEnv(flags.env, { scope: resolveDefaultConfigScope() });
+        const scope = resolveDefaultConfigScope();
+        const env = await getEnv(flags.env, { scope });
         if (!env) {
             this.error(flags.env
                 ? portalCreateText('errors.envNotConfigured', { envName: flags.env }, `Env "${flags.env}" is not configured. Run \`nb env add ${flags.env} --api-base-url <url>\` first.`)

package/dist/lib/api-client.js

@@ -199,6 +199,13 @@ async function createMultipartBody(flags, operation) {
         if (value === undefined) {
             continue;
         }
+        if (Array.isArray(value)) {
+            for (const item of value) {
+                formData.append(parameter.name, typeof item === 'object' ? JSON.stringify(item) : String(item));
+            }
+            hasValues = hasValues || value.length > 0;
+            continue;
+        }
         formData.append(parameter.name, typeof value === 'object' ? JSON.stringify(value) : String(value));
         hasValues = true;
     }

package/dist/lib/env-auth.js

@@ -32,12 +32,12 @@ function buildDeviceVerificationPathFromApiBaseUrl(apiBaseUrl) {
     const subappMatch = url.pathname.match(/^(.*)\/api\/__app\/([^/]+)\/?$/);
     if (subappMatch) {
         const publicPath = (subappMatch[1] || '').replace(/\/+$/, '');
-        return `${publicPath}/apps/${subappMatch[2]}/idpOAuth/device`;
+        return `${publicPath}/settings/apps/${subappMatch[2]}/idpOAuth/device`;
     }
     const appMatch = url.pathname.match(/^(.*)\/api\/?$/);
     if (appMatch) {
         const publicPath = (appMatch[1] || '').replace(/\/+$/, '');
-        return `${publicPath}/idpOAuth/device`;
+        return `${publicPath}/settings/idpOAuth/device`;
     }
     return undefined;
 }

package/dist/lib/env-proxy.js

@@ -20,6 +20,9 @@ const DEFAULT_API_BASE_PATH = '/api/';
 const DEFAULT_WS_PATH = '/ws';
 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 DEFAULT_API_CLIENT_STORAGE_PREFIX = 'NOCOBASE_';
 const DEFAULT_API_CLIENT_STORAGE_TYPE = 'localStorage';
 const DEFAULT_ESM_CDN_BASE_URL = 'https://esm.sh';
@@ -67,7 +70,15 @@ function normalizeModernClientPrefix(value) {
     const segment = String(value || '')
         .trim()
         .replace(/^\/+|\/+$/g, '');
-    return segment || DEFAULT_MODERN_CLIENT_PREFIX;
+    const normalized = segment || DEFAULT_MODERN_CLIENT_PREFIX;
+    if (normalized === SETTINGS_CLIENT_PREFIX) {
+        throw new Error('APP_MODERN_CLIENT_PREFIX "settings" is reserved for the standalone Settings application.');
+    }
+    return normalized;
+}
+function normalizeAppClientEntryMode(value) {
+    const normalized = String(value || '').trim();
+    return APP_CLIENT_ENTRY_MODES.has(normalized) ? normalized : DEFAULT_APP_CLIENT_ENTRY_MODE;
 }
 function normalizeApiBasePath(value = DEFAULT_API_BASE_PATH) {
     return resolveAppPublicPath(value);
@@ -275,6 +286,7 @@ export async function loadEnvProxySettings(runtime, options) {
             wsPath: prefixRuntimePath(appPublicPath, envValues.WS_PATH || DEFAULT_WS_PATH),
             pluginStaticsPath: prefixRuntimePath(appPublicPath, envValues.PLUGIN_STATICS_PATH || DEFAULT_PLUGIN_STATICS_PATH, { trailingSlash: true }),
             modernClientPrefix: normalizeModernClientPrefix(envValues.APP_MODERN_CLIENT_PREFIX),
+            appClientEntryMode: normalizeAppClientEntryMode(envValues.APP_CLIENT_ENTRY_MODE),
             cdnBaseUrl: trimValue(options?.cdnBaseUrl) ??
                 trimValue(runtime.env.envVars?.CDN_BASE_URL) ??
                 trimValue(envValues.CDN_BASE_URL),
@@ -299,7 +311,8 @@ function createManualProxyEnvSettings(input) {
         pluginStaticsPath: prefixRuntimePath(appPublicPath, DEFAULT_PLUGIN_STATICS_PATH, {
             trailingSlash: true,
         }),
-        modernClientPrefix: DEFAULT_MODERN_CLIENT_PREFIX,
+        modernClientPrefix: normalizeModernClientPrefix(process.env.APP_MODERN_CLIENT_PREFIX),
+        appClientEntryMode: normalizeAppClientEntryMode(process.env.APP_CLIENT_ENTRY_MODE),
         cdnBaseUrl: trimValue(input.cdnBaseUrl),
         apiClientStoragePrefix: DEFAULT_API_CLIENT_STORAGE_PREFIX,
         apiClientStorageType: DEFAULT_API_CLIENT_STORAGE_TYPE,
@@ -491,6 +504,9 @@ function buildNginxManagedConfigBlock(context) {
     const apiBasePathNoTrailingSlash = trimTrailingSlash(context.apiBasePath);
     const appPublicPathNoTrailingSlash = trimTrailingSlash(context.appPublicPath);
     const fileAccessPath = `${context.appPublicPath}files/`;
+    const settingsAssetsPath = `${context.appPublicPath}settings/assets/`;
+    const settingsAssetsRoot = joinRuntimePath(context.distRootDir, `${context.activeVersion}/settings/assets`);
+    const settingsRoutePattern = `^${escapeRegExp(context.appPublicPath)}settings(?:/|$)`;
     const isRootMounted = context.appPublicPath === '/';
     const appPublicPathRedirectBlock = isRootMounted
         ? ''
@@ -563,6 +579,17 @@ function buildNginxManagedConfigBlock(context) {
         `        return 302 ${context.v2PublicPath}$is_args$args;`,
         '    }',
         '',
+        `    location ^~ ${settingsAssetsPath} {`,
+        `        alias ${settingsAssetsRoot}/;`,
+        `        include ${context.snippetsDir}/dist-location.conf;`,
+        '    }',
+        '',
+        `    location ~ ${settingsRoutePattern} {`,
+        `        root ${context.publicDir};`,
+        `        try_files $uri /index-settings.html =404;`,
+        `        include ${context.snippetsDir}/spa-location.conf;`,
+        '    }',
+        '',
         `    location ^~ ${context.v2PublicPath} {`,
         `        alias ${context.publicDir}/;`,
         `        try_files $uri /index-v2.html =404;`,
@@ -640,8 +667,9 @@ function buildNginxPortalLocationBlock(context) {
 function buildNginxRuntimeConfig(context, variant) {
     return {
         __webpack_public_path__: context.cdnBaseUrl,
-        __nocobase_public_path__: variant === 'v1' ? context.appPublicPath : context.v2PublicPath,
-        ...(variant === 'v2' ? { __nocobase_modern_client_prefix__: context.modernClientPrefix } : {}),
+        __nocobase_public_path__: variant === 'v2' ? context.v2PublicPath : context.appPublicPath,
+        ...(variant !== 'v1' ? { __nocobase_modern_client_prefix__: context.modernClientPrefix } : {}),
+        __nocobase_app_client_entry_mode__: context.appClientEntryMode,
         __nocobase_api_base_url__: context.apiBasePath,
         __nocobase_api_client_storage_prefix__: context.apiClientStoragePrefix,
         __nocobase_api_client_storage_type__: context.apiClientStorageType,
@@ -692,7 +720,9 @@ async function buildEnvProxyNginxRenderContext(source, options) {
         esmCdnSuffix: source.settings.esmCdnSuffix,
         indexV1Path: await mapProxyPathFromCliRoot(resolveEnvProxyNginxIndexOutputPath(source.envName, 'v1', { scope: options?.scope }), options),
         indexV2Path: await mapProxyPathFromCliRoot(resolveEnvProxyNginxIndexOutputPath(source.envName, 'v2', { scope: options?.scope }), options),
+        indexSettingsPath: await mapProxyPathFromCliRoot(resolveEnvProxyNginxIndexOutputPath(source.envName, 'settings', { scope: options?.scope }), options),
         modernClientPrefix: source.settings.modernClientPrefix,
+        appClientEntryMode: source.settings.appClientEntryMode,
         proxyHost,
         snippetsDir: mappedSnippetsDir,
         storageDir: mappedStorageDir,
@@ -811,16 +841,20 @@ async function buildNginxBundleFromSource(source, options) {
     const mainTemplate = await readEnvProxyNginxAssetText('nocobase.conf.tpl');
     const sourceIndexV1Path = path.join(source.distRootPath, context.activeVersion, 'index.html');
     const sourceIndexV2Path = path.join(source.distRootPath, context.activeVersion, DEFAULT_MODERN_CLIENT_PREFIX, 'index.html');
-    const [sourceIndexV1Content, sourceIndexV2Content] = await Promise.all([
+    const sourceIndexSettingsPath = path.join(source.distRootPath, context.activeVersion, 'settings', 'index.html');
+    const [sourceIndexV1Content, sourceIndexV2Content, sourceIndexSettingsContent] = await Promise.all([
         readFile(sourceIndexV1Path, 'utf8'),
         readFile(sourceIndexV2Path, 'utf8'),
+        readFile(sourceIndexSettingsPath, 'utf8'),
     ]);
     const v1RuntimeScript = buildRuntimeConfigScriptTag(buildNginxRuntimeConfig(context, 'v1'));
     const v2RuntimeScript = buildRuntimeConfigScriptTag(buildNginxRuntimeConfig(context, 'v2'));
+    const settingsRuntimeScript = buildRuntimeConfigScriptTag(buildNginxRuntimeConfig(context, 'settings'));
     const sourceV1PublicPath = extractRuntimePublicPath(sourceIndexV1Content);
     const sourceV2PublicPath = extractRuntimePublicPath(sourceIndexV2Content);
     const indexV1AssetPublicPath = context.cdnBaseUrl;
     const indexV2AssetPublicPath = `${trimTrailingSlash(context.cdnBaseUrl)}/${DEFAULT_MODERN_CLIENT_PREFIX}/`;
+    const indexSettingsAssetPublicPath = `${trimTrailingSlash(context.cdnBaseUrl)}/settings/`;
     const appConfigIncludePath = await mapProxyPathFromCliRoot(path.join(resolveEnvProxyProviderRootDir('nginx', { scope: options?.scope }), '*', resolveEnvProxyFileSpec('nginx').appFilename), options);
     const managedConfigBlock = buildNginxManagedConfigBlock(context);
     const templateValues = {
@@ -844,6 +878,7 @@ async function buildNginxBundleFromSource(source, options) {
         appConfigPath: resolveEnvProxyAppOutputPath(source.envName, { scope: options?.scope, provider: 'nginx' }),
         indexV1Path: resolveEnvProxyNginxIndexOutputPath(source.envName, 'v1', { scope: options?.scope }),
         indexV2Path: resolveEnvProxyNginxIndexOutputPath(source.envName, 'v2', { scope: options?.scope }),
+        indexSettingsPath: resolveEnvProxyNginxIndexOutputPath(source.envName, 'settings', { scope: options?.scope }),
         mainConfigPath: resolveEnvProxyMainOutputPath({ scope: options?.scope, provider: 'nginx' }),
         snippetsDir: resolveEnvProxyNginxSnippetsOutputDir({ scope: options?.scope }),
         appPublicPath: context.appPublicPath,
@@ -861,6 +896,7 @@ async function buildNginxBundleFromSource(source, options) {
         }),
         indexV1Content: injectRuntimeScriptIntoHtml(rewriteHtmlAssetPublicPath(sourceIndexV1Content, sourceV1PublicPath, indexV1AssetPublicPath), v1RuntimeScript),
         indexV2Content: injectRuntimeScriptIntoHtml(rewriteHtmlAssetPublicPath(sourceIndexV2Content, sourceV2PublicPath, indexV2AssetPublicPath), v2RuntimeScript),
+        indexSettingsContent: injectRuntimeScriptIntoHtml(rewriteHtmlAssetPublicPath(sourceIndexSettingsContent, '/settings/', indexSettingsAssetPublicPath), settingsRuntimeScript),
     };
 }
 export async function buildEnvProxyCaddyBundle(runtime, options) {
@@ -877,21 +913,26 @@ async function buildCaddyBundleFromSource(source, options) {
     const context = await buildEnvProxyCaddyRenderContextFromSource(source, options);
     const sourceIndexV1Path = path.join(source.distRootPath, context.activeVersion, 'index.html');
     const sourceIndexV2Path = path.join(source.distRootPath, context.activeVersion, DEFAULT_MODERN_CLIENT_PREFIX, 'index.html');
-    const [sourceIndexV1Content, sourceIndexV2Content] = await Promise.all([
+    const sourceIndexSettingsPath = path.join(source.distRootPath, context.activeVersion, 'settings', 'index.html');
+    const [sourceIndexV1Content, sourceIndexV2Content, sourceIndexSettingsContent] = await Promise.all([
         readFile(sourceIndexV1Path, 'utf8'),
         readFile(sourceIndexV2Path, 'utf8'),
+        readFile(sourceIndexSettingsPath, 'utf8'),
     ]);
     const v1RuntimeScript = buildRuntimeConfigScriptTag(buildCaddyRuntimeConfig(context, 'v1'));
     const v2RuntimeScript = buildRuntimeConfigScriptTag(buildCaddyRuntimeConfig(context, 'v2'));
+    const settingsRuntimeScript = buildRuntimeConfigScriptTag(buildCaddyRuntimeConfig(context, 'settings'));
     const sourceV1PublicPath = extractRuntimePublicPath(sourceIndexV1Content);
     const sourceV2PublicPath = extractRuntimePublicPath(sourceIndexV2Content);
     const indexV1AssetPublicPath = context.cdnBaseUrl;
     const indexV2AssetPublicPath = `${trimTrailingSlash(context.cdnBaseUrl)}/${DEFAULT_MODERN_CLIENT_PREFIX}/`;
+    const indexSettingsAssetPublicPath = `${trimTrailingSlash(context.cdnBaseUrl)}/settings/`;
     const appConfigPath = resolveEnvProxyAppOutputPath(source.envName, { scope: options?.scope, provider: 'caddy' });
     const entryDir = resolveEnvProxyEntryDir(source.envName, { scope: options?.scope, provider: 'caddy' });
     const publicDir = resolveEnvProxyCaddyPublicOutputDir(source.envName, { scope: options?.scope });
     const renderedPublicDir = await mapProxyPathFromCliRoot(publicDir, { ...options, provider: 'caddy' });
     const appConfigContent = renderCaddyAppTemplate(buildCaddySiteAddress(), {
+        activeVersion: context.activeVersion,
         appPublicPath: context.appPublicPath,
         apiBasePath: context.apiBasePath,
         apiPort: context.apiPort,
@@ -912,6 +953,7 @@ async function buildCaddyBundleFromSource(source, options) {
         appConfigPath,
         indexV1Path: resolveEnvProxyCaddyIndexOutputPath(source.envName, 'v1', { scope: options?.scope }),
         indexV2Path: resolveEnvProxyCaddyIndexOutputPath(source.envName, 'v2', { scope: options?.scope }),
+        indexSettingsPath: resolveEnvProxyCaddyIndexOutputPath(source.envName, 'settings', { scope: options?.scope }),
         mainConfigPath: resolveEnvProxyMainOutputPath({ scope: options?.scope, provider: 'caddy' }),
         appPublicPath: context.appPublicPath,
         apiBasePath: context.apiBasePath,
@@ -925,6 +967,7 @@ async function buildCaddyBundleFromSource(source, options) {
         mainConfigContent: await buildEnvProxyMainConfig({ provider: 'caddy', scope: options?.scope }),
         indexV1Content: injectRuntimeScriptIntoHtml(rewriteHtmlAssetPublicPath(sourceIndexV1Content, sourceV1PublicPath, indexV1AssetPublicPath), v1RuntimeScript),
         indexV2Content: injectRuntimeScriptIntoHtml(rewriteHtmlAssetPublicPath(sourceIndexV2Content, sourceV2PublicPath, indexV2AssetPublicPath), v2RuntimeScript),
+        indexSettingsContent: injectRuntimeScriptIntoHtml(rewriteHtmlAssetPublicPath(sourceIndexSettingsContent, '/settings/', indexSettingsAssetPublicPath), settingsRuntimeScript),
     };
 }
 async function pathExists(candidate) {
@@ -1179,6 +1222,9 @@ function renderCaddyAppTemplate(siteAddress, context, publicDir) {
     const uploadsPath = `${context.appPublicPath}storage/uploads/`;
     const fileAccessPathMatcher = toCaddyPathMatcher(`${context.appPublicPath}files/`);
     const distPathMatcher = toCaddyPathMatcher(context.distPath);
+    const settingsAssetsPathMatcher = toCaddyPathMatcher(`${context.appPublicPath}settings/assets/`);
+    const settingsAssetsRoot = joinRuntimePath(context.distClientRoot, `${context.activeVersion}/settings/assets`);
+    const settingsRoutePattern = `^${escapeRegExp(context.appPublicPath)}settings(?:/.*)?$`;
     const uploadsPathMatcher = toCaddyPathMatcher(uploadsPath);
     const apiPathMatcher = toCaddyPathMatcher(context.apiBasePath);
     const appPublicPathNoTrailingSlash = trimTrailingSlash(context.appPublicPath);
@@ -1236,6 +1282,12 @@ function renderCaddyAppTemplate(siteAddress, context, publicDir) {
         '        file_server',
         '    }',
         '',
+        `    handle_path ${settingsAssetsPathMatcher} {`,
+        `        root * ${settingsAssetsRoot}`,
+        '        header Cache-Control "public, max-age=31536000, immutable"',
+        '        file_server',
+        '    }',
+        '',
         '    @oauth path_regexp oauth ^/\\.well-known/oauth-authorization-server/(.+)$',
         '    handle @oauth {',
         '        rewrite * /{re.oauth.1}/.well-known/oauth-authorization-server',
@@ -1269,6 +1321,15 @@ function renderCaddyAppTemplate(siteAddress, context, publicDir) {
         `        reverse_proxy ${context.proxyHost}:${context.apiPort}`,
         '    }',
         '',
+        `    @settingsRoute path_regexp settingsRoute ${settingsRoutePattern}`,
+        '    handle @settingsRoute {',
+        `        root * ${publicDir}`,
+        '        header Cache-Control "no-store, no-cache, must-revalidate"',
+        '        header X-Robots-Tag "noindex, nofollow"',
+        '        try_files {path} /index-settings.html',
+        '        file_server',
+        '    }',
+        '',
         '    # Keep the v2 SPA route above the fallback SPA route.',
         `    handle_path ${toCaddyPathMatcher(context.v2PublicPath)} {`,
         `        root * ${publicDir}`,
@@ -1341,6 +1402,7 @@ async function buildEnvProxyRenderState(runtime, options) {
         : await mapProxyPathFromCliRoot(distClientRoot, options);
     const provider = resolveProxyProviderName(options?.provider);
     const templateContext = {
+        activeVersion: runtimeVersion,
         appPublicPath: settings.appPublicPath,
         apiBasePath: settings.apiBasePath,
         apiPort,

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

@@ -6,11 +6,17 @@
  * 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 { readFile } from 'node:fs/promises';
+import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import path from 'node:path';
+import { resolveEnvKind } from './auth-store.js';
 import { resolveConfiguredEnvPath } from './cli-home.js';
-import { resolveDockerEnvFileArg } from "./docker-env-file.js";
+import { resolveDockerEnvFileArg, resolveDockerEnvFilePath } from "./docker-env-file.js";
 import { resolveConfiguredAppPath } from './env-paths.js';
+export const DEFAULT_MANAGED_ENV_FILE_VALUES = {
+    APP_DISCOVERY_ADAPTER: 'local',
+    APP_PROCESS_ADAPTER: 'local',
+    APP_CLIENT_ENTRY_MODE: 'modern-only',
+};
 function trimValue(value) {
     const text = String(value ?? '').trim();
     return text || undefined;
@@ -68,6 +74,56 @@ export function resolveManagedLocalEnvFilePath(runtime) {
     }
     return normalizeEnvFilePath(path.join(runtime.projectRoot, '.env'));
 }
+export function resolveManagedEnvFilePathFromConfig(envName, config) {
+    const kind = config?.kind ?? resolveEnvKind(config);
+    if (kind === 'docker') {
+        const filePath = resolveDockerEnvFilePath(envName, config);
+        return filePath ? normalizeEnvFilePath(filePath) : undefined;
+    }
+    if (kind !== 'local') {
+        return undefined;
+    }
+    const explicitEnvFile = trimValue(config?.envFile);
+    if (explicitEnvFile) {
+        return normalizeEnvFilePath(resolveConfiguredEnvPath(explicitEnvFile) ?? explicitEnvFile);
+    }
+    const configuredAppPath = resolveConfiguredAppPath(config);
+    if (configuredAppPath) {
+        return normalizeEnvFilePath(path.join(configuredAppPath, '.env'));
+    }
+    const configuredAppRootPath = trimValue(config?.appRootPath);
+    if (configuredAppRootPath) {
+        const appRootPath = resolveConfiguredEnvPath(configuredAppRootPath) ?? configuredAppRootPath;
+        return normalizeEnvFilePath(path.basename(appRootPath) === 'source' ? path.resolve(appRootPath, '..', '.env') : path.join(appRootPath, '.env'));
+    }
+    return undefined;
+}
+export async function ensureManagedEnvFileDefaults(envName, config, defaults = DEFAULT_MANAGED_ENV_FILE_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 existing = parseSimpleEnvFile(content);
+    const missingEntries = Object.entries(defaults).filter(([key, value]) => trimValue(value) && !existing[key]);
+    if (missingEntries.length === 0) {
+        return envFilePath;
+    }
+    const separator = content && !content.endsWith('\n') ? '\n' : '';
+    const nextContent = `${content}${separator}${missingEntries.map(([key, value]) => `${key}=${value}`).join('\n')}\n`;
+    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/naming.js

@@ -1,6 +1,15 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
 import path from 'node:path';
 export function toKebabCase(value) {
     return value
+        .replace(/([A-Z]+)([A-Z][a-z])/g, '$1-$2')
         .replace(/([a-z0-9])([A-Z])/g, '$1-$2')
         .replace(/[^a-zA-Z0-9]+/g, '-')
         .replace(/-+/g, '-')

package/dist/lib/proxy-caddy.js

@@ -79,6 +79,7 @@ export async function writeCaddyProxyBundle(runtime, appEntryOptions, runtimeCon
         writeFile(bundle.appConfigPath, nextAppConfigContent, 'utf8'),
         writeFile(bundle.indexV1Path, bundle.indexV1Content, 'utf8'),
         writeFile(bundle.indexV2Path, bundle.indexV2Content, 'utf8'),
+        writeFile(bundle.indexSettingsPath, bundle.indexSettingsContent, 'utf8'),
         writeFile(bundle.mainConfigPath, bundle.mainConfigContent, 'utf8'),
     ]);
     return {
@@ -100,6 +101,7 @@ export async function writeManualCaddyProxyBundle(input, appEntryOptions, runtim
         writeFile(bundle.appConfigPath, nextAppConfigContent, 'utf8'),
         writeFile(bundle.indexV1Path, bundle.indexV1Content, 'utf8'),
         writeFile(bundle.indexV2Path, bundle.indexV2Content, 'utf8'),
+        writeFile(bundle.indexSettingsPath, bundle.indexSettingsContent, 'utf8'),
         writeFile(bundle.mainConfigPath, bundle.mainConfigContent, 'utf8'),
     ]);
     return {

package/dist/lib/proxy-nginx.js

@@ -107,6 +107,7 @@ async function writeResolvedNginxProxyBundle(bundle, appEntryOptions, options) {
         writeFile(bundle.appConfigPath, nextAppConfigContent, 'utf8'),
         writeFile(bundle.indexV1Path, bundle.indexV1Content, 'utf8'),
         writeFile(bundle.indexV2Path, bundle.indexV2Content, 'utf8'),
+        writeFile(bundle.indexSettingsPath, bundle.indexSettingsContent, 'utf8'),
         writeFile(bundle.mainConfigPath, bundle.mainConfigContent, 'utf8'),
         syncEnvProxyNginxSnippets(),
     ]);

package/nocobase-ctl.config.json

@@ -202,6 +202,117 @@
         }
       }
     },
+    "ai": {
+      "name": "ai",
+      "description": "Discover LLM providers and manage LLM services and AI employees.",
+      "include": true,
+      "resources": {
+        "includes": ["ai", "llmServices", "aiEmployees"],
+        "excludes": [],
+        "overrides": {
+          "ai": {
+            "name": "llm-providers",
+            "description": "Discover providers and models and test unsaved LLM settings.",
+            "topLevel": false,
+            "operations": {
+              "includes": [
+                "ai:listLLMProviders",
+                "ai:listProviderModels",
+                "ai:testFlight",
+                "ai:listModels",
+                "ai:listLLMServices"
+              ]
+            }
+          },
+          "llmServices": {
+            "name": "llm-services",
+            "description": "Manage saved LLM service configurations.",
+            "topLevel": false,
+            "operations": {
+              "includes": [
+                "llmServices:list",
+                "llmServices:get",
+                "llmServices:create",
+                "llmServices:update",
+                "llmServices:destroy"
+              ]
+            }
+          },
+          "aiEmployees": {
+            "name": "employees",
+            "description": "Manage AI employees.",
+            "topLevel": false,
+            "operations": {
+              "includes": [
+                "aiEmployees:list",
+                "aiEmployees:get",
+                "aiEmployees:create",
+                "aiEmployees:update",
+                "aiEmployees:destroy"
+              ]
+            }
+          }
+        }
+      }
+    },
+    "kb": {
+      "name": "kb",
+      "description": "Manage vector databases, knowledge bases, documents, vectorization, and retrieval tests.",
+      "include": true,
+      "resources": {
+        "includes": ["aiVectorDatabases", "aiKnowledgeBase", "aiKnowledgeBaseDocs"],
+        "excludes": [],
+        "overrides": {
+          "aiVectorDatabases": {
+            "name": "vector-databases",
+            "description": "Manage vector database connections.",
+            "topLevel": false,
+            "operations": {
+              "includes": [
+                "aiVectorDatabases:listProviders",
+                "aiVectorDatabases:testConnection",
+                "aiVectorDatabases:list",
+                "aiVectorDatabases:get",
+                "aiVectorDatabases:create",
+                "aiVectorDatabases:update",
+                "aiVectorDatabases:destroy"
+              ]
+            }
+          },
+          "aiKnowledgeBase": {
+            "name": "kb",
+            "segments": ["kb"],
+            "description": "Manage knowledge bases and retrieval tests.",
+            "topLevel": true,
+            "operations": {
+              "includes": [
+                "aiKnowledgeBase:list",
+                "aiKnowledgeBase:get",
+                "aiKnowledgeBase:create",
+                "aiKnowledgeBase:update",
+                "aiKnowledgeBase:destroy",
+                "aiKnowledgeBase:runHitTest",
+                "aiKnowledgeBase:listExternalVectorStoreProviders"
+              ]
+            }
+          },
+          "aiKnowledgeBaseDocs": {
+            "name": "documents",
+            "description": "Manage knowledge base documents and vectorization.",
+            "topLevel": false,
+            "operations": {
+              "includes": [
+                "aiKnowledgeBaseDocs:list",
+                "aiKnowledgeBaseDocs:get",
+                "aiKnowledgeBaseDocs:upload",
+                "aiKnowledgeBaseDocs:vectorization",
+                "aiKnowledgeBaseDocs:destroy"
+              ]
+            }
+          }
+        }
+      }
+    },
     "flow-engine": {
       "name": "flow-engine",
       "description": "Manage flow surface composition, configuration, layout, and mutation APIs.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.2.0-alpha.10",
+  "version": "2.2.0-alpha.12",
   "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": "b5a3f131bb0a4a2fbfd96852896bccadc933d834"
+  "gitHead": "96ae69754a6398de63037ead3a4aad5e5d0ab918"
 }