@nocobase/cli 3.0.0-alpha.1 → 3.0.0-alpha.11

package/dist/commands/portal/create.js

@@ -7,21 +7,21 @@
  * 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';
 import { createPortalWorkspace } from '../../lib/portal-create.js';
-import { printInfo, printSuccess } from '../../lib/ui.js';
+import { printInfo, printSuccess, printWarning } 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 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,18 +78,19 @@ 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}`));
+        if (result.installFailed) {
+            printWarning(portalCreateText('messages.installFailed', { portalDir: result.portalDir }, `Dependency installation did not finish successfully. Run \`pnpm install\` manually in ${result.portalDir}.`));
+        }
     }
 }

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/dev.js

@@ -59,6 +59,8 @@ export default class PortalDev extends Command {
         await devPortalWorkspace({
             portal: args.portal,
             env,
+            envName,
+            cliVersion: String(this.config?.pjson?.version ?? '').trim(),
             onStart: (result) => {
                 printInfo(portalDevText('messages.starting', { portal: result.portal }, `Starting portal "${result.portal}"...`));
                 printInfo(portalDevText('messages.mode', { mode: result.mode }, `Mode: ${result.mode}`));

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),
         ])));
     }
 }

package/dist/commands/portal/pull.js

@@ -7,18 +7,20 @@
  * 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';
 import { pullPortalSource } from '../../lib/portal-source.js';
-import { printInfo, printSuccess } from '../../lib/ui.js';
+import { printInfo, printSuccess, printWarning } from '../../lib/ui.js';
 const portalPullText = (key, values, fallback) => translateCli(`commands.portalPull.${key}`, values, { fallback });
 export default class PortalPull extends Command {
     static summary = 'Pull portal source into local files';
     static examples = [
         '<%= config.bin %> <%= command.id %> customer',
         '<%= config.bin %> <%= command.id %> customer --env prod --yes',
+        '<%= config.bin %> <%= command.id %> customer --path ./portals/customer',
+        '<%= config.bin %> <%= command.id %> customer --git-repo git@github.com:nocobase/customer.git',
         '<%= config.bin %> <%= command.id %> customer --force',
         '<%= config.bin %> <%= command.id %> customer --no-install',
     ];
@@ -42,6 +44,18 @@ export default class PortalPull extends Command {
             description: 'Delete the existing local files and pull them again',
             default: false,
         }),
+        path: Flags.string({
+            description: 'Portal workspace directory; defaults to the saved path, then ./<portal>',
+        }),
+        'git-repo': Flags.string({
+            description: 'Temporarily pull source from this Git repository without updating the portal source configuration',
+        }),
+        'git-branch': Flags.string({
+            description: 'Git branch for the temporary --git-repo pull; defaults to main',
+        }),
+        'git-path': Flags.string({
+            description: 'Directory inside the temporary Git repository; defaults to the repository root',
+        }),
         install: Flags.boolean({
             description: 'Run pnpm install after pulling the portal source',
             default: true,
@@ -50,6 +64,12 @@ export default class PortalPull extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(PortalPull);
+        if ((flags['git-branch'] || flags['git-path']) && !flags['git-repo']) {
+            this.error(portalPullText('errors.gitRepoRequiredForTemporaryPull', undefined, [
+                '--git-branch and --git-path require --git-repo for a temporary Git pull.',
+                'To update the portal configuration, use `nb portal config`.',
+            ].join(' ')));
+        }
         const requestedEnv = hasExplicitEnvSelection(this.argv) ? flags.env : undefined;
         const confirmed = await ensureCrossEnvConfirmed({
             command: this,
@@ -74,11 +94,20 @@ export default class PortalPull extends Command {
             cliVersion: String(this.config.pjson.version ?? '').trim(),
             force: flags.force,
             installDependencies: flags.install,
+            sourcePath: flags.path,
+            defaultSourcePath: true,
+            gitRepo: flags['git-repo'],
+            gitBranch: flags['git-branch'],
+            gitPath: flags['git-path'],
         });
         if (!result.changed) {
             printInfo(result.noopReason ?? portalPullText('messages.noop', undefined, 'No pull is needed.'));
             return;
         }
-        printSuccess(portalPullText('messages.pulled', { portal: result.portal, portalDir: result.portalDir }, `Pulled portal source "${result.portal}" into ${result.portalDir}.`));
+        await setEnvPortalPath(envName, result.portal, result.portalDir, { scope });
+        printSuccess(portalPullText('messages.pulled', { portal: result.portal, portalDir: result.portalDir }, `Pulled portal source "${result.portal}" into ${result.portalDir}`));
+        if (result.installFailed) {
+            printWarning(portalPullText('messages.installFailed', { portalDir: result.portalDir }, `Dependency installation did not finish successfully. Run \`pnpm install\` manually in ${result.portalDir}.`));
+        }
     }
 }

package/dist/lib/api-client.js

@@ -19,6 +19,7 @@ import { promises as fs } from 'node:fs';
 import { basename, dirname } from 'node:path';
 import { Readable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
+import { translateCli } from './cli-locale.js';
 import { resolveServerRequestTarget } from './env-auth.js';
 import { fetchWithPreservedAuthRedirect } from './http-request.js';
 const CLI_REQUEST_SOURCE_HEADER = 'x-request-source';
@@ -40,7 +41,32 @@ function parseJsonInput(raw, flagName) {
 function normalizeBaseUrl(baseUrl) {
     return baseUrl.replace(/\/+$/, '');
 }
-async function parseResponse(response) {
+function buildAuthFailureCommand(envName) {
+    const normalizedEnvName = String(envName ?? '').trim();
+    return normalizedEnvName ? `nb env auth ${normalizedEnvName}` : 'nb env auth';
+}
+function decorateAuthFailureResponse(data, status, envName) {
+    if (status !== 401) {
+        return data;
+    }
+    const cliCommand = buildAuthFailureCommand(envName);
+    const cliHint = translateCli('apiClient.authRequiredHint', { command: cliCommand }, {
+        fallback: 'Authentication failed or the saved session has expired. Run `{{command}}` to sign in again.',
+    });
+    if (data && typeof data === 'object' && !Array.isArray(data)) {
+        return {
+            ...data,
+            cliHint,
+            cliCommand,
+        };
+    }
+    return {
+        error: data,
+        cliHint,
+        cliCommand,
+    };
+}
+async function parseResponse(response, envName) {
     const text = await response.text();
     let data = text;
     if (text) {
@@ -54,10 +80,10 @@ async function parseResponse(response) {
     return {
         ok: response.ok,
         status: response.status,
-        data,
+        data: decorateAuthFailureResponse(data, response.status, envName),
     };
 }
-async function parseBinaryResponse(response, outputPath) {
+async function parseBinaryResponse(response, outputPath, envName) {
     if (response.ok && response.body) {
         await fs.mkdir(dirname(outputPath), { recursive: true }).catch(() => undefined);
         await pipeline(Readable.fromWeb(response.body), createWriteStream(outputPath));
@@ -69,7 +95,7 @@ async function parseBinaryResponse(response, outputPath) {
             },
         };
     }
-    return parseResponse(response);
+    return parseResponse(response, envName);
 }
 function parseScalarValue(value, type) {
     if (value === undefined) {
@@ -215,7 +241,7 @@ async function createMultipartBody(flags, operation) {
     return hasValues ? formData : undefined;
 }
 export async function executeApiRequest(options) {
-    const { baseUrl, token } = await resolveServerRequestTarget(options);
+    const { baseUrl, token, envName } = await resolveServerRequestTarget(options);
     const headers = new Headers();
     headers.set(CLI_REQUEST_SOURCE_HEADER, CLI_REQUEST_SOURCE_VALUE);
     headers.set(CLI_VERSION_HEADER, options.cliVersion);
@@ -283,12 +309,12 @@ export async function executeApiRequest(options) {
         if (!outputPath) {
             throw new Error('Missing required output path --output');
         }
-        return parseBinaryResponse(response, outputPath);
+        return parseBinaryResponse(response, outputPath, envName);
     }
-    return parseResponse(response);
+    return parseResponse(response, envName);
 }
 export async function executeRawApiRequest(options) {
-    const { baseUrl, token } = await resolveServerRequestTarget(options);
+    const { baseUrl, token, envName } = await resolveServerRequestTarget(options);
     const headers = new Headers();
     headers.set(CLI_REQUEST_SOURCE_HEADER, CLI_REQUEST_SOURCE_VALUE);
     if (token) {
@@ -332,7 +358,7 @@ export async function executeRawApiRequest(options) {
             body: options.body === undefined ? undefined : JSON.stringify(options.body),
             signal: controller?.signal,
         });
-        return parseResponse(response);
+        return parseResponse(response, envName);
     }
     finally {
         if (timeout) {

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

@@ -14,6 +14,7 @@ import { normalizeCliLocale } from './cli-locale.js';
 import { normalizeEnvProxyConfig, normalizeEnvProxyProviderConfig, } from './env-proxy-config.js';
 import { inferConfiguredAppPathFromLegacyConfig, resolveConfiguredAppPath, resolveConfiguredSourcePath, resolveConfiguredStoragePath, } from './env-paths.js';
 import { ENV_CONFIG_SCHEMA_VERSION, normalizeEnvConfigSchemaVersion } from './env-config.js';
+import { normalizeEnvPortalsConfig, } from './env-portal-config.js';
 import { cleanupCurrentSessionAfterEnvRemoval, resolveEffectiveCurrentEnv, setSessionCurrentEnv, } from './session-store.js';
 function normalizeStoredEnvKind(value) {
     const kind = String(value ?? '').trim();
@@ -78,11 +79,12 @@ function normalizeEnvConfigEntry(entry) {
     if (!entry) {
         return entry;
     }
-    const { kind: _kind, apiBaseUrl: _apiBaseUrl, baseUrl: _baseUrl, apibaseUrl: _legacyApiBaseUrl, schemaVersion: _schemaVersion, ...rest } = entry;
+    const { kind: _kind, apiBaseUrl: _apiBaseUrl, baseUrl: _baseUrl, apibaseUrl: _legacyApiBaseUrl, schemaVersion: _schemaVersion, portals: _portals, ...rest } = entry;
     const normalizedKind = resolveEnvKind(entry);
     const apiBaseUrl = readEnvApiBaseUrl(entry);
     const schemaVersion = normalizeEnvConfigSchemaVersion(entry.schemaVersion);
     const proxy = normalizeEnvProxyConfig(entry.proxy);
+    const portals = normalizeEnvPortalsConfig(entry.portals);
     return {
         ...rest,
         ...(schemaVersion ? { schemaVersion } : {}),
@@ -90,6 +92,7 @@ function normalizeEnvConfigEntry(entry) {
         ...(apiBaseUrl !== undefined ? { apiBaseUrl } : {}),
         ...(normalizeOptionalString(entry.appPublicPath) ? { appPublicPath: resolveAppPublicPath(entry.appPublicPath) } : {}),
         ...(proxy ? { proxy } : {}),
+        ...(portals ? { portals } : {}),
     };
 }
 function normalizeAuthConfig(config) {
@@ -332,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);
@@ -521,6 +525,53 @@ export async function setEnvRuntime(envName, runtime, options = {}) {
     };
     await saveAuthConfig(config, options);
 }
+export function resolveEnvPortalPath(config, portal) {
+    const portalName = normalizeOptionalString(portal);
+    if (!portalName) {
+        return undefined;
+    }
+    return normalizeOptionalString(config?.portals?.[portalName]?.path);
+}
+export async function setEnvPortalPath(envName, portal, portalPath, options = {}) {
+    const portalName = normalizeOptionalString(portal);
+    const normalizedPath = normalizeOptionalString(portalPath);
+    if (!portalName || !normalizedPath) {
+        return;
+    }
+    await writeEnv(envName, (previous) => {
+        if (!previous) {
+            throw new Error(`Env "${envName}" is not configured`);
+        }
+        const portals = normalizeEnvPortalsConfig(previous.portals) ?? {};
+        return {
+            ...previous,
+            portals: {
+                ...portals,
+                [portalName]: {
+                    ...(portals[portalName] ?? {}),
+                    path: normalizedPath,
+                },
+            },
+        };
+    }, options);
+}
+export async function unsetEnvPortalPath(envName, portal, options = {}) {
+    const portalName = normalizeOptionalString(portal);
+    if (!portalName) {
+        return;
+    }
+    await writeEnv(envName, (previous) => {
+        if (!previous) {
+            throw new Error(`Env "${envName}" is not configured`);
+        }
+        const portals = normalizeEnvPortalsConfig(previous.portals) ?? {};
+        delete portals[portalName];
+        return {
+            ...previous,
+            ...(Object.keys(portals).length > 0 ? { portals } : { portals: undefined }),
+        };
+    }, options);
+}
 export function resolveEnvProxyEntry(config, provider) {
     const proxy = normalizeEnvProxyConfig(config?.proxy);
     const resolved = {

package/dist/lib/bootstrap.js

@@ -72,7 +72,9 @@ function hasVersionFlag(argv) {
 function isBuiltinCommand(argv) {
     const commandTokens = argv.filter((token) => token && !token.startsWith('-'));
     const [topic, subtopic] = commandTokens;
-    return topic === 'env' || topic === 'resource' || (topic === 'api' && subtopic === 'resource');
+    return (topic === 'env' ||
+        topic === 'resource' ||
+        (topic === 'api' && (subtopic === 'resource' || subtopic === 'swagger')));
 }
 export function shouldSkipRuntimeBootstrap(argv) {
     return hasVersionFlag(argv) || isBuiltinCommand(argv);

package/dist/lib/browser.js

@@ -0,0 +1,29 @@
+/**
+ * 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 { spawn } from 'node:child_process';
+export async function openUrlInDefaultBrowser(url) {
+    const [command, args, options] = process.platform === 'darwin'
+        ? ['open', [url], { detached: true, stdio: 'ignore' }]
+        : process.platform === 'win32'
+            ? ['cmd', ['/c', 'start', '', url], { detached: true, stdio: 'ignore', windowsHide: true }]
+            : ['xdg-open', [url], { detached: true, stdio: 'ignore' }];
+    return new Promise((resolve) => {
+        try {
+            const child = spawn(command, args, options);
+            child.once('error', () => resolve(false));
+            child.once('spawn', () => {
+                child.unref();
+                resolve(true);
+            });
+        }
+        catch {
+            resolve(false);
+        }
+    });
+}

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`;
 }
@@ -973,7 +939,7 @@ export async function resolveServerRequestTarget(options) {
                 : `Use --api-base-url or run \`nb init --ui --env ${envName}\` first.`,
         ].join('\n'));
     }
-    return { baseUrl, token };
+    return { baseUrl, token, envName };
 }
 export async function authenticateEnvWithBasic(options) {
     const envName = options.envName ?? (await getCurrentEnvName({ scope: options.scope }));
@@ -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',