@nocobase/cli 3.0.0-alpha.5 → 3.0.0-alpha.7

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/commands/portal/config.js

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Args, Command, Flags } from '@oclif/core';
-import { getCurrentEnvName, getEnv } from '../../lib/auth-store.js';
+import { getCurrentEnvName, getEnv, setEnvPortalPath } from '../../lib/auth-store.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { translateCli } from '../../lib/cli-locale.js';
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
@@ -17,6 +17,7 @@ const portalConfigureText = (key, values, fallback) => translateCli(`commands.po
 export default class PortalConfig extends Command {
     static summary = 'Update portal source configuration';
     static examples = [
+        '<%= config.bin %> <%= command.id %> customer --path ./portals/customer',
         '<%= config.bin %> <%= command.id %> customer --source-storage nocobase',
         '<%= config.bin %> <%= command.id %> customer --source-storage git --git-repo git@github.com:nocobase/customer-portal.git',
         '<%= config.bin %> <%= command.id %> customer --git-branch main --git-path portals/customer',
@@ -41,6 +42,9 @@ export default class PortalConfig extends Command {
             description: 'Where portal source code is managed',
             options: ['nocobase', 'git'],
         }),
+        path: Flags.string({
+            description: 'Portal development workspace directory',
+        }),
         'git-repo': Flags.string({
             description: 'Git repository URL used when --source-storage=git',
         }),
@@ -79,10 +83,17 @@ export default class PortalConfig extends Command {
             gitRepo: flags['git-repo'],
             gitBranch: flags['git-branch'],
             gitPath: flags['git-path'],
+            sourcePath: flags.path,
         });
-        printSuccess(portalConfigureText('messages.updated', { portal: result.portal, portalDir: result.portalDir }, `Portal "${result.portal}" configuration updated at ${result.portalDir}/portal.config.json.`));
-        printInfo(result.remoteSynced
-            ? portalConfigureText('messages.remoteSynced', undefined, 'Remote portal record: synced')
-            : portalConfigureText('messages.remoteSkipped', undefined, 'Remote portal record: not found; local config only'));
+        if (flags.path) {
+            await setEnvPortalPath(envName, result.portal, result.portalDir, { scope });
+        }
+        printSuccess(portalConfigureText('messages.updated', { portal: result.portal }, `Portal "${result.portal}" configuration updated.`));
+        if (result.pathUpdated) {
+            printInfo(portalConfigureText('messages.pathUpdated', { portalDir: result.portalDir }, `Development path: ${result.portalDir}`));
+        }
+        if (result.config) {
+            printInfo(portalConfigureText('messages.remoteSynced', undefined, 'Remote portal record: synced'));
+        }
     }
 }

package/dist/commands/portal/create.js

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Args, Command, Flags } from '@oclif/core';
-import { getEnv } from '../../lib/auth-store.js';
+import { getCurrentEnvName, getEnv, setEnvPortalPath } from '../../lib/auth-store.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { translateCli } from '../../lib/cli-locale.js';
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
@@ -19,9 +19,9 @@ export default class PortalCreate extends Command {
     static summary = 'Create a local AI portal from a template';
     static examples = [
         '<%= config.bin %> <%= command.id %> customer',
+        '<%= config.bin %> <%= command.id %> customer --path ./portals/customer',
         '<%= config.bin %> <%= command.id %> customer --template @nocobase/portal-template-default',
         '<%= config.bin %> <%= command.id %> customer --env dev --yes',
-        '<%= config.bin %> <%= command.id %> customer --source-storage git --git-repo git@github.com:nocobase/customer-portal.git',
     ];
     static args = {
         portal: Args.string({
@@ -46,24 +46,13 @@ export default class PortalCreate extends Command {
         title: Flags.string({
             description: 'Portal display title; defaults to a title generated from the portal slug',
         }),
+        path: Flags.string({
+            description: 'Portal workspace directory; defaults to ./<portal>',
+        }),
         force: Flags.boolean({
             description: 'Delete the existing portal and recreate it',
             default: false,
         }),
-        'source-storage': Flags.string({
-            description: 'Where portal source code is managed',
-            options: ['nocobase', 'git'],
-            default: 'nocobase',
-        }),
-        'git-repo': Flags.string({
-            description: 'Git repository URL used when --source-storage=git',
-        }),
-        'git-branch': Flags.string({
-            description: 'Git branch used when --source-storage=git',
-        }),
-        'git-path': Flags.string({
-            description: 'Directory inside the Git repository for this portal; defaults to the repository root',
-        }),
     };
     async run() {
         const { args, flags } = await this.parse(PortalCreate);
@@ -77,10 +66,11 @@ export default class PortalCreate extends Command {
             return;
         }
         const scope = resolveDefaultConfigScope();
-        const env = await getEnv(flags.env, { scope });
+        const envName = requestedEnv ?? (await getCurrentEnvName({ scope }));
+        const env = await getEnv(envName, { 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.`)
+            this.error(requestedEnv
+                ? portalCreateText('errors.envNotConfigured', { envName }, `Env "${envName}" is not configured. Run \`nb env add ${envName} --api-base-url <url>\` first.`)
                 : portalCreateText('errors.noEnvConfigured', undefined, 'No NocoBase env is configured yet. Run `nb init --ui` to create one first.'));
         }
         const result = await createPortalWorkspace({
@@ -88,16 +78,14 @@ export default class PortalCreate extends Command {
             title: flags.title,
             template: flags.template,
             env,
-            envName: flags.env,
+            envName,
             cliVersion: String(this.config.pjson.version ?? '').trim(),
             force: flags.force,
-            sourceStorage: flags['source-storage'],
-            gitRepo: flags['git-repo'],
-            gitBranch: flags['git-branch'],
-            gitPath: flags['git-path'],
+            sourcePath: flags.path,
             onSkipInstall: (message) => printInfo(message),
         });
-        printSuccess(portalCreateText('messages.created', { portal: result.portal, portalDir: result.portalDir }, `Portal "${result.portal}" created at ${result.portalDir}.`));
+        await setEnvPortalPath(envName, result.portal, result.portalDir, { scope });
+        printSuccess(portalCreateText('messages.created', { portal: result.portal, portalDir: result.portalDir }, `Portal "${result.portal}" created at ${result.portalDir}`));
         printInfo(portalCreateText('messages.app', { app: result.app }, `App: ${result.app}`));
         printInfo(portalCreateText('messages.base', { base: result.portalBase }, `Base: ${result.portalBase}`));
         printInfo(portalCreateText('messages.sourceStorage', { sourceStorage: result.sourceStorage }, `Source storage: ${result.sourceStorage}`));

package/dist/commands/portal/destroy.js

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Args, Command, Flags } from '@oclif/core';
-import { getCurrentEnvName, getEnv } from '../../lib/auth-store.js';
+import { getCurrentEnvName, getEnv, unsetEnvPortalPath } from '../../lib/auth-store.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { translateCli } from '../../lib/cli-locale.js';
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
@@ -15,6 +15,9 @@ import { confirm } from "../../lib/inquirer.js";
 import { destroyPortalWorkspace } from '../../lib/portal-destroy.js';
 import { isInteractiveTerminal, printInfo, printSuccess } from '../../lib/ui.js';
 const portalDestroyText = (key, values, fallback) => translateCli(`commands.portalDestroy.${key}`, values, { fallback });
+function portalDestroyStatus(status) {
+    return portalDestroyText(`statuses.${status}`, undefined, status);
+}
 async function ensureDestroyConfirmed(options) {
     if (options.yes) {
         return true;
@@ -24,7 +27,7 @@ async function ensureDestroyConfirmed(options) {
     }
     try {
         return Boolean(await confirm({
-            message: portalDestroyText('prompts.confirm', { portal: options.portal }, `Destroy portal "${options.portal}" and delete its storage directory?`),
+            message: portalDestroyText('prompts.confirm', { portal: options.portal }, `Destroy portal "${options.portal}" and delete its deployment directory?`),
             default: false,
         }));
     }
@@ -33,9 +36,10 @@ async function ensureDestroyConfirmed(options) {
     }
 }
 export default class PortalDestroy extends Command {
-    static summary = 'Destroy a portal record and local files';
+    static summary = 'Destroy a portal record and deployed files';
     static examples = [
         '<%= config.bin %> <%= command.id %> customer --yes',
+        '<%= config.bin %> <%= command.id %> customer --delete-dev-path --yes',
         '<%= config.bin %> <%= command.id %> customer --env dev --yes',
         '<%= config.bin %> <%= command.id %> customer --force --yes',
     ];
@@ -56,7 +60,12 @@ export default class PortalDestroy extends Command {
             default: false,
         }),
         force: Flags.boolean({
-            description: 'Ignore missing portal records or local files',
+            description: 'Ignore missing portal records or deployment files',
+            default: false,
+        }),
+        'delete-dev-path': Flags.boolean({
+            char: 'D',
+            description: 'Delete the portal development directory in addition to the deployed portal',
             default: false,
         }),
     };
@@ -93,12 +102,25 @@ export default class PortalDestroy extends Command {
             envName,
             cliVersion: String(this.config.pjson.version ?? '').trim(),
             force: flags.force,
+            deleteDevPath: flags['delete-dev-path'],
         });
+        await unsetEnvPortalPath(envName, result.portal, { scope });
         printSuccess(portalDestroyText('messages.destroyed', { portal: result.portal }, `Portal "${result.portal}" destroyed.`));
         printInfo(portalDestroyText('messages.mode', { mode: result.mode }, `Mode: ${result.mode}`));
         printInfo(portalDestroyText('messages.app', { app: result.app }, `App: ${result.app}`));
         printInfo(portalDestroyText('messages.base', { base: result.portalBase }, `Base: ${result.portalBase}`));
-        printInfo(portalDestroyText('messages.record', { status: result.recordDeleted ? 'deleted' : 'missing' }, `Record: ${result.recordDeleted ? 'deleted' : 'missing'}`));
-        printInfo(portalDestroyText('messages.workspace', { dir: result.portalDir, status: result.workspaceDeleted ? 'deleted' : 'missing' }, `Portal files: ${result.workspaceDeleted ? 'deleted' : 'missing'} (${result.portalDir})`));
+        printInfo(portalDestroyText('messages.record', { status: portalDestroyStatus(result.recordDeleted ? 'deleted' : 'missing') }, `Record: ${result.recordDeleted ? 'deleted' : 'missing'}`));
+        const deploymentPathStatus = result.deploymentPathDeleted ? 'deleted' : 'missing';
+        printInfo(portalDestroyText('messages.deploymentPath', { dir: result.deploymentPath, status: portalDestroyStatus(deploymentPathStatus) }, `Deployment path: ${deploymentPathStatus} (${result.deploymentPath})`));
+        let developmentPathStatus = 'missing';
+        if (result.developmentPath) {
+            developmentPathStatus = result.developmentPathDeleted ? 'deleted' : 'retained';
+        }
+        printInfo(portalDestroyText(result.developmentPath ? 'messages.developmentPath' : 'messages.developmentPathMissing', {
+            dir: result.developmentPath,
+            status: portalDestroyStatus(developmentPathStatus),
+        }, result.developmentPath
+            ? `Development path: ${developmentPathStatus} (${result.developmentPath})`
+            : 'Development path: missing'));
     }
 }

package/dist/commands/portal/list.js

@@ -21,7 +21,7 @@ function formatBoolean(value) {
     return value ? 'yes' : 'no';
 }
 export default class PortalList extends Command {
-    static summary = 'List portal records and local sync status';
+    static summary = 'List portal records and development paths';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --env dev --yes',
@@ -82,17 +82,17 @@ export default class PortalList extends Command {
             portalListText('table.url', undefined, 'URL'),
             portalListText('table.portalType', undefined, 'Portal type'),
             portalListText('table.sourceStorage', undefined, 'Source storage'),
-            portalListText('table.path', undefined, 'Local path'),
+            portalListText('table.path', undefined, 'Development path'),
             portalListText('table.enabled', undefined, 'Enabled'),
-            portalListText('table.localSynced', undefined, 'Local synced'),
+            portalListText('table.default', undefined, 'Default'),
         ], outputItems.map((item) => [
             item.name,
             item.url,
             item.portalType,
             item.sourceStorage,
-            item.localPath,
+            item.developmentPath,
             formatBoolean(item.enabled),
-            formatBoolean(item.localSynced),
+            formatBoolean(item.isDefault),
         ])));
     }
 }