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

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

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

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

@@ -34,6 +34,13 @@ function resolveTextDefault(def, out) {
     }
     return String(iv ?? '');
 }
+function resolveSelectDefault(def, out) {
+    const iv = def.initialValue;
+    if (typeof iv === 'function') {
+        return iv(out);
+    }
+    return iv;
+}
 function resolvePasswordDefault(def, out) {
     const iv = def.initialValue;
     if (typeof iv === 'function') {
@@ -98,7 +105,7 @@ function defaultValueForInput(key, def, out) {
             const first = def.options
                 .find((o) => typeof o === 'string' || o.disabled !== true);
             const firstValue = typeof first === 'string' ? first : first?.value;
-            const i = def.initialValue;
+            const i = resolveSelectDefault(def, out);
             const enabledValues = def.options
                 .filter((o) => typeof o === 'string' || o.disabled !== true)
                 .map((o) => (typeof o === 'string' ? o : o.value));
@@ -765,11 +772,10 @@ function runPromptCatalogWebUIImpl(options) {
             }
         };
         const servePage = (port) => {
-            const base = `http://${publicHost}:${port}`;
             const formInner = buildPwcFormHtml(catalog, formDefaults, initialShow, pwcStepDefs, 0, pwcNSteps, locale, uiText);
             const wizardClientJson = JSON.stringify({ n: pwcNSteps, stepDefs: pwcStepDefs });
-            const pwcValStepUrl = pwcNSteps > 1 ? JSON.stringify(base + resolveValidateStepPath) : 'null';
-            const pwcValFieldUrl = JSON.stringify(base + resolveValidateFieldPath);
+            const pwcValStepUrl = pwcNSteps > 1 ? JSON.stringify(resolveValidateStepPath) : 'null';
+            const pwcValFieldUrl = JSON.stringify(resolveValidateFieldPath);
             const uiTextJson = JSON.stringify(uiText);
             const pwcShellClass = options.stages && options.stages.length > 0
                 ? 'pwc-shell pwc-shell--stages'
@@ -1493,8 +1499,8 @@ function runPromptCatalogWebUIImpl(options) {
   </div>
   <script>
   (function () {
-    var sub = ${JSON.stringify(base + submitPath)};
-    var ref = ${JSON.stringify(base + reflowPath)};
+    var sub = ${JSON.stringify(submitPath)};
+    var ref = ${JSON.stringify(reflowPath)};
     var pwcValStep = ${pwcValStepUrl};
     var pwcValField = ${pwcValFieldUrl};
     var pwcStepMeta = ${JSON.stringify(PWC_FORM_META_STEP)};

package/dist/lib/resource-command.js

@@ -41,6 +41,22 @@ function parseObjectFlag(value, flagName) {
     }
     return parsed;
 }
+function parseValuesFlag(value, flagName) {
+    if (value === undefined) {
+        return undefined;
+    }
+    const parsed = parseJson(value, flagName);
+    if (!parsed || typeof parsed !== 'object') {
+        throw new Error(`--${flagName} must be a JSON object, or a JSON array of objects to create multiple records`);
+    }
+    if (Array.isArray(parsed)) {
+        const invalidIndex = parsed.findIndex((item) => !item || Array.isArray(item) || typeof item !== 'object');
+        if (invalidIndex !== -1) {
+            throw new Error(`--${flagName} array items must all be JSON objects, but item ${invalidIndex} is not`);
+        }
+    }
+    return parsed;
+}
 function parseJsonArrayFlag(value, flagName) {
     if (value === undefined) {
         return undefined;
@@ -187,7 +203,7 @@ export const createFlags = {
     ...resourceBaseFlags,
     ...resourceAssociationFlags,
     values: Flags.string({
-        description: 'Record values used by create as a JSON object.',
+        description: 'Record values used by create as a JSON object, or a JSON array of objects to create multiple records in one request.',
         required: true,
     }),
     whitelist: Flags.string({
@@ -298,7 +314,7 @@ export function buildGetArgs(flags) {
 export function buildCreateArgs(flags) {
     return {
         ...pickSharedArgs(flags),
-        values: parseObjectFlag(flags.values, 'values'),
+        values: parseValuesFlag(flags.values, 'values'),
         whitelist: parseStringArrayFlags(flags.whitelist, 'whitelist'),
         blacklist: parseStringArrayFlags(flags.blacklist, 'blacklist'),
     };

package/dist/lib/resource-request.js

@@ -1,3 +1,11 @@
+/**
+ * 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 { executeRawApiRequest } from './api-client.js';
 function buildActionUrl(resource, action, sourceId) {
     if (typeof sourceId === 'undefined' || sourceId === null || !resource.includes('.')) {

package/dist/lib/run-npm.js

@@ -75,18 +75,82 @@ function buildProcessEnv(options) {
     };
 }
 function createMissingCommandError(name, label, error) {
-    const code = error && typeof error === 'object' && 'code' in error ? String(error.code) : undefined;
-    if (code !== 'ENOENT') {
-        return undefined;
-    }
     if (!Object.prototype.hasOwnProperty.call(MISSING_COMMAND_SPECS, name)) {
         return undefined;
     }
     const spec = MISSING_COMMAND_SPECS[name];
+    if (!isMissingCommandError(name, spec.displayName, error)) {
+        return undefined;
+    }
     return new Error(translateCli('commands.shared.missingCommand', { action: label, displayName: spec.displayName, configKey: spec.configKey }, {
         fallback: `Couldn't run \`${label}\` because the ${spec.displayName} executable could not be found. Install ${spec.displayName} or update \`nb config set ${spec.configKey} <path>\` and try again.`,
     }));
 }
+function isMissingCommandError(name, displayName, error) {
+    const code = error && typeof error === 'object' && 'code' in error ? String(error.code) : undefined;
+    if (code === 'ENOENT') {
+        return true;
+    }
+    const message = error instanceof Error ? error.message : String(error);
+    const lowerMessage = message.toLowerCase();
+    return (lowerMessage.includes(`spawn ${name.toLowerCase()} enoent`) ||
+        lowerMessage.includes(`${name.toLowerCase()} executable could not be found`) ||
+        lowerMessage.includes(`${displayName.toLowerCase()} executable could not be found`));
+}
+export async function runPnpmCommand(runCommand, args, options) {
+    try {
+        await runCommand('pnpm', args, options);
+    }
+    catch (error) {
+        throw createMissingCommandError('pnpm', options.errorName ?? `pnpm ${args.join(' ')}`.trim(), error) ?? error;
+    }
+}
+function createInstallArgsWithoutTrustLockfile(args) {
+    if (!args.includes('install') || !args.includes('--trust-lockfile')) {
+        return undefined;
+    }
+    return args.filter((arg) => arg !== '--trust-lockfile');
+}
+function isFriendlyMissingPnpmError(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return message.includes('because the pnpm executable could not be found');
+}
+function formatPnpmLabel(args) {
+    return `pnpm ${args.join(' ')}`.trim();
+}
+export async function resolvePnpmInstallCommand(cwd) {
+    const hasLockfile = await fsp
+        .stat(path.join(cwd, 'pnpm-lock.yaml'))
+        .then((stats) => stats.isFile())
+        .catch(() => false);
+    if (hasLockfile) {
+        const args = ['install', '--frozen-lockfile', '--trust-lockfile'];
+        return {
+            args,
+            errorName: formatPnpmLabel(args),
+        };
+    }
+    const args = ['install'];
+    return {
+        args,
+        errorName: formatPnpmLabel(args),
+    };
+}
+export async function runPnpmInstallCommand(runCommand, args, options) {
+    try {
+        await runPnpmCommand(runCommand, args, options);
+    }
+    catch (error) {
+        const fallbackArgs = createInstallArgsWithoutTrustLockfile(args);
+        if (!fallbackArgs || isFriendlyMissingPnpmError(error)) {
+            throw error;
+        }
+        await runPnpmCommand(runCommand, fallbackArgs, {
+            ...options,
+            errorName: formatPnpmLabel(fallbackArgs),
+        });
+    }
+}
 function isDockerDaemonUnavailableError(error) {
     const message = error instanceof Error ? error.message : String(error);
     return DOCKER_DAEMON_UNAVAILABLE_PATTERNS.some((pattern) => pattern.test(message));

package/dist/lib/runtime-generator.js

@@ -18,7 +18,31 @@ import { createHash } from 'node:crypto';
 import { loadBuildConfig } from './build-config.js';
 import { toKebabCase, toLogicalActionName, toLogicalResourceName, toResourceSegments } from './naming.js';
 import { collectOperations } from './openapi.js';
-const RESERVED_FLAG_NAMES = new Set(['api-base-url', 'base-url', 'env', 'token', 'json-output', 'body', 'body-file', 'yes']);
+const RESERVED_FLAG_NAMES = new Set(['api-base-url', 'base-url', 'env', 'token', 'json-output', 'body', 'body-file', 'ui', 'yes']);
+const isRecord = (value) => value !== null && typeof value === 'object' && !Array.isArray(value);
+const isStringArray = (value) => Array.isArray(value) && value.every((item) => typeof item === 'string' && Boolean(item));
+function getGeneratedUIOperation(operation, parameters) {
+    if (!operation.operationId) {
+        return undefined;
+    }
+    const extension = operation['x-nocobase-cli-ui'];
+    if (!isRecord(extension) || typeof extension.path !== 'string') {
+        return undefined;
+    }
+    const path = extension.path.trim();
+    if (!path || path.startsWith('/') || /[?#]/.test(path) || /^[a-z][a-z\d+.-]*:/i.test(path)) {
+        return undefined;
+    }
+    const mappedParameters = extension.parameters === undefined ? [] : extension.parameters;
+    if (!isStringArray(mappedParameters) || new Set(mappedParameters).size !== mappedParameters.length) {
+        return undefined;
+    }
+    const allowedParameters = new Set(parameters.map((parameter) => parameter.name));
+    if (!mappedParameters.every((parameter) => allowedParameters.has(parameter))) {
+        return undefined;
+    }
+    return { path, parameters: mappedParameters };
+}
 function matchesPattern(value, pattern) {
     if (!value) {
         return false;
@@ -425,6 +449,7 @@ export async function generateRuntime(document, configFile, baseUrl) {
         const parameters = (operation.parameters ?? []).filter(isSupportedParameter).map((parameter) => toGeneratedParameter(parameter, usedFlagNames));
         const bodyParameters = extractBodyParameters(operation.requestBody, usedFlagNames);
         const allParameters = [...parameters, ...bodyParameters];
+        const ui = getGeneratedUIOperation(operation, allParameters);
         const hasBody = Boolean(operation.requestBody && !('$ref' in operation.requestBody));
         const requestContentType = getRequestContentType(operation.requestBody);
         const responseType = getResponseType(operation);
@@ -456,6 +481,8 @@ export async function generateRuntime(document, configFile, baseUrl) {
             resourceDisplayName,
             resourceDescription,
             commandId: segments.join(' '),
+            operationId: operation.operationId,
+            ui,
             method,
             pathTemplate,
             tags: operation.tags,

package/dist/lib/swagger-command.js

@@ -0,0 +1,52 @@
+/**
+ * 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 { Flags } from '@oclif/core';
+import { executeRawApiRequest } from './api-client.js';
+import { ensureCrossEnvConfirmed } from './env-guard.js';
+export const swaggerRequestFlags = {
+    env: Flags.string({
+        char: 'e',
+        description: 'CLI env name; omitted uses the current env',
+    }),
+    yes: Flags.boolean({
+        char: 'y',
+        description: 'Confirm using --env when it targets a different env than the current env',
+        default: false,
+    }),
+    'api-base-url': Flags.string({
+        description: 'NocoBase API base URL, for example http://localhost:13000/api',
+    }),
+    role: Flags.string({
+        description: 'Role override, sent as X-Role',
+    }),
+    token: Flags.string({
+        char: 't',
+        description: 'API key or access token override',
+    }),
+};
+export async function executeSwaggerRequest(command, flags, path, query) {
+    const requestedEnv = flags.env?.trim() || undefined;
+    const confirmed = await ensureCrossEnvConfirmed({
+        command,
+        requestedEnv,
+        yes: flags.yes,
+    });
+    if (!confirmed) {
+        return undefined;
+    }
+    return executeRawApiRequest({
+        envName: requestedEnv,
+        baseUrl: flags['api-base-url'],
+        token: flags.token,
+        role: flags.role,
+        method: 'GET',
+        path,
+        query,
+    });
+}

package/dist/locale/en-US.json

@@ -89,6 +89,9 @@
       "lowerCaseTableNamesRequiresUnderscored": "MySQL lower_case_table_names=1 requires DB_UNDERSCORED=true."
     }
   },
+  "apiClient": {
+    "authRequiredHint": "Authentication failed or the saved session has expired. Run `{{command}}` to sign in again."
+  },
   "commands": {
     "envAdd": {
       "prompts": {
@@ -185,14 +188,16 @@
         "missingApiBaseUrl": "Cannot create a portal because the selected env has no apiBaseUrl.",
         "outsideParent": "Refusing to modify a portal outside {{parentDir}}: {{portalDir}}",
         "sshUnsupported": "Cannot create a portal for ssh envs in the first version.",
-        "workspaceExists": "Portal already exists: {{portalDir}}\nPass --force to delete it and create a new portal."
+        "workspaceExists": "Portal already exists: {{portalDir}}\nPass --force to delete it and create a new portal.",
+        "workspaceNotReplaceable": "Refusing to replace a non-portal directory: {{portalDir}}\nThe target directory must be empty or contain package.json with a nocobase field."
       },
       "messages": {
         "skipInstall": "Skipped pnpm install because package.json was not found in {{portalDir}}.",
-        "created": "Portal \"{{portal}}\" created at {{portalDir}}.",
+        "created": "Portal \"{{portal}}\" created at {{portalDir}}",
         "app": "App: {{app}}",
         "base": "Base: {{base}}",
-        "sourceStorage": "Source storage: {{sourceStorage}}"
+        "sourceStorage": "Source storage: {{sourceStorage}}",
+        "installFailed": "Dependency installation did not finish successfully. Run `pnpm install` manually in {{portalDir}}."
       }
     },
     "portalConfig": {
@@ -209,11 +214,12 @@
       "errors": {
         "envNotConfigured": "Env \"{{envName}}\" is not configured. Run `nb env add {{envName}} --api-base-url <url>` first.",
         "noEnvConfigured": "No NocoBase env is configured yet. Run `nb init --ui` to create one first.",
-        "noChanges": "No portal configuration changes were provided. Pass --source-storage or a --git-* flag.",
-        "workspaceMissing": "Portal does not exist: {{portalDir}}\nRun `nb portal create {{portal}}` or `nb portal pull {{portal}}` first."
+        "noChanges": "No portal configuration changes were provided. Pass --path, --source-storage, or a --git-* flag.",
+        "notFound": "Portal \"{{portal}}\" was not found. Run `nb portal list` to see available portals."
       },
       "messages": {
-        "updated": "Portal \"{{portal}}\" configuration updated at {{portalDir}}/portal.config.json.",
+        "updated": "Portal \"{{portal}}\" configuration updated.",
+        "pathUpdated": "Development path: {{portalDir}}",
         "remoteSynced": "Remote portal record: synced",
         "remoteSkipped": "Remote portal record: not found; local config only"
       }
@@ -254,9 +260,52 @@
         "name": "Name",
         "url": "URL",
         "portalType": "Portal type",
-        "path": "Local path",
+        "path": "Development path",
         "enabled": "Enabled",
-        "localSynced": "Local synced"
+        "default": "Default"
+      }
+    },
+    "portalPull": {
+      "errors": {
+        "envNotConfigured": "Env \"{{envName}}\" is not configured. Run `nb env add {{envName}} --api-base-url <url>` first.",
+        "noEnvConfigured": "No NocoBase env is configured yet. Run `nb init --ui` to create one first.",
+        "gitRepoRequiredForTemporaryPull": "--git-branch and --git-path require --git-repo for a temporary Git pull. To update the portal configuration, use `nb portal config`."
+      },
+      "messages": {
+        "noop": "No pull is needed.",
+        "pulled": "Pulled portal source \"{{portal}}\" into {{portalDir}}",
+        "installFailed": "Dependency installation did not finish successfully. Run `pnpm install` manually in {{portalDir}}."
+      }
+    },
+    "portalSource": {
+      "errors": {
+        "workspaceNotReplaceable": "Refusing to replace a non-portal directory: {{portalDir}}\nThe target directory must be empty or contain package.json with a nocobase field."
+      }
+    },
+    "swagger": {
+      "errors": {
+        "pluginDisabled": "The API documentation plugin is not enabled. Enable it before requesting Swagger documents.",
+        "requestFailed": "Swagger request failed with status {{status}}\n{{details}}",
+        "invalidDestinations": "swagger:getUrls returned an invalid destination list.",
+        "invalidDocument": "swagger:get returned an invalid OpenAPI document."
+      },
+      "messages": {
+        "empty": "No Swagger document namespaces are available.",
+        "saved": "Saved Swagger document to {{output}}."
+      },
+      "table": {
+        "name": "Name",
+        "namespace": "Namespace",
+        "url": "URL",
+        "field": "Field",
+        "value": "Value"
+      },
+      "fields": {
+        "namespace": "Namespace",
+        "title": "Title",
+        "version": "Version",
+        "openapi": "OpenAPI",
+        "paths": "Paths"
       }
     },
     "portalInfo": {
@@ -269,9 +318,9 @@
         "name": "Name",
         "url": "URL",
         "portalType": "Portal type",
-        "path": "Local path",
-        "enabled": "Enabled",
-        "localSynced": "Local synced"
+        "developmentPath": "Development path",
+        "deploymentPath": "Deployment path",
+        "enabled": "Enabled"
       }
     },
     "portalDestroy": {
@@ -280,12 +329,18 @@
         "noEnvConfigured": "No NocoBase env is configured yet. Run `nb init --ui` to create one first.",
         "confirmationRequired": "Refusing to destroy a portal in non-interactive mode without --yes.",
         "outsideParent": "Refusing to delete a portal outside {{parentDir}}: {{portalDir}}",
-        "workspaceMissing": "Portal does not exist: {{portalDir}}\nPass --force to ignore missing local files.",
+        "workspaceMissing": "Portal deployment path does not exist: {{portalDir}}\nPass --force to ignore missing deployment files.",
         "unsupportedEnvKind": "Cannot destroy a portal for {{kind}} envs in the first version.",
+        "unsafeDevelopmentPath": "Refusing to delete an unsafe portal development path: {{portalDir}}",
         "recordDestroyFailed": "Portal record destroy failed with status {{status}}\n{{details}}"
       },
       "prompts": {
-        "confirm": "Destroy portal \"{{portal}}\" and delete its storage directory?"
+        "confirm": "Destroy portal \"{{portal}}\" and delete its deployment directory?"
+      },
+      "statuses": {
+        "deleted": "deleted",
+        "missing": "missing",
+        "retained": "retained"
       },
       "messages": {
         "destroyed": "Portal \"{{portal}}\" destroyed.",
@@ -293,7 +348,9 @@
         "app": "App: {{app}}",
         "base": "Base: {{base}}",
         "record": "Record: {{status}}",
-        "workspace": "Portal files: {{status}} ({{dir}})"
+        "deploymentPath": "Deployment path: {{status}} ({{dir}})",
+        "developmentPath": "Development path: {{status}} ({{dir}})",
+        "developmentPathMissing": "Development path: missing"
       }
     },
     "portalDev": {
@@ -411,7 +468,7 @@
           "betaLabel": "beta",
           "betaHint": "Preview release. Good for trying upcoming features before general release.",
           "alphaLabel": "alpha",
-          "alphaHint": "Development release. Includes the newest changes, but may be incomplete or unstable.",
+          "alphaHint": "Choose this version to try the new features in 3.0.",
           "otherLabel": "Other",
           "otherHint": "Enter another package version, Docker tag, or Git ref manually, such as a branch name."
         },
@@ -600,6 +657,15 @@
         "skipDownload": {
           "message": "Skip downloading NocoBase and reuse existing local app files or Docker images"
         },
+        "appClientEntryMode": {
+          "message": "App client entry mode",
+          "modernOnlyLabel": "Modern UI only",
+          "modernOnlyHint": "Only the modern UI is available; the legacy UI cannot be accessed.",
+          "modernDefaultLabel": "Modern UI by default",
+          "modernDefaultHint": "Open the modern UI by default while keeping the legacy UI available.",
+          "legacyDefaultLabel": "Legacy UI by default",
+          "legacyDefaultHint": "Open the legacy UI by default while keeping the modern UI available."
+        },
         "portalType": {
           "message": "Portal type",
           "noCodeLabel": "No-code portal",

package/dist/locale/zh-CN.json

@@ -89,6 +89,9 @@
       "lowerCaseTableNamesRequiresUnderscored": "当 MySQL 的 lower_case_table_names=1 时，必须设置 DB_UNDERSCORED=true。"
     }
   },
+  "apiClient": {
+    "authRequiredHint": "认证失败或已保存的登录状态已过期。请运行 `{{command}}` 重新认证。"
+  },
   "commands": {
     "envAdd": {
       "prompts": {
@@ -185,14 +188,16 @@
         "missingApiBaseUrl": "无法创建 Portal，因为当前 env 没有 apiBaseUrl。",
         "outsideParent": "拒绝修改 {{parentDir}} 之外的 Portal：{{portalDir}}",
         "sshUnsupported": "第一版暂不支持为 ssh env 创建 Portal。",
-        "workspaceExists": "Portal 已存在：{{portalDir}}\n如需删除并重新创建，请追加 --force。"
+        "workspaceExists": "Portal 已存在：{{portalDir}}\n如需删除并重新创建，请追加 --force。",
+        "workspaceNotReplaceable": "拒绝替换非 Portal 目录：{{portalDir}}\n目标目录必须为空，或包含带 nocobase 字段的 package.json。"
       },
       "messages": {
         "skipInstall": "未找到 {{portalDir}}/package.json，已跳过 pnpm install。",
-        "created": "Portal \"{{portal}}\" 已创建：{{portalDir}}。",
+        "created": "Portal \"{{portal}}\" 已创建：{{portalDir}}",
         "app": "App：{{app}}",
         "base": "Base：{{base}}",
-        "sourceStorage": "源码存储：{{sourceStorage}}"
+        "sourceStorage": "源码存储：{{sourceStorage}}",
+        "installFailed": "依赖安装没有成功完成。请在 {{portalDir}} 中手动运行 `pnpm install`。"
       }
     },
     "portalConfig": {
@@ -209,11 +214,12 @@
       "errors": {
         "envNotConfigured": "env \"{{envName}}\" 尚未配置。请先运行 `nb env add {{envName}} --api-base-url <url>`。",
         "noEnvConfigured": "还没有配置 NocoBase env。请先运行 `nb init --ui` 创建一个。",
-        "noChanges": "没有提供 Portal 配置变更。请传入 --source-storage 或 --git-* 参数。",
-        "workspaceMissing": "Portal 不存在：{{portalDir}}\n请先运行 `nb portal create {{portal}}` 或 `nb portal pull {{portal}}`。"
+        "noChanges": "没有提供 Portal 配置变更。请传入 --path、--source-storage 或 --git-* 参数。",
+        "notFound": "Portal \"{{portal}}\" 不存在。请运行 `nb portal list` 查看可用 Portal。"
       },
       "messages": {
-        "updated": "Portal \"{{portal}}\" 配置已更新：{{portalDir}}/portal.config.json。",
+        "updated": "Portal \"{{portal}}\" 配置已更新。",
+        "pathUpdated": "开发路径：{{portalDir}}",
         "remoteSynced": "远端 Portal 记录：已同步",
         "remoteSkipped": "远端 Portal 记录：未找到，仅更新本地配置"
       }
@@ -254,9 +260,52 @@
         "name": "名称",
         "url": "访问 URL",
         "portalType": "Portal 类型",
-        "path": "本地路径",
+        "path": "开发路径",
         "enabled": "启用",
-        "localSynced": "本地已同步"
+        "default": "默认"
+      }
+    },
+    "portalPull": {
+      "errors": {
+        "envNotConfigured": "env \"{{envName}}\" 尚未配置。请先运行 `nb env add {{envName}} --api-base-url <url>`。",
+        "noEnvConfigured": "还没有配置 NocoBase env。请先运行 `nb init --ui` 创建一个。",
+        "gitRepoRequiredForTemporaryPull": "--git-branch 和 --git-path 作为临时 Git pull 参数时必须同时提供 --git-repo。如需更新 Portal 配置，请使用 `nb portal config`。"
+      },
+      "messages": {
+        "noop": "无需执行 pull。",
+        "pulled": "Portal 源码 \"{{portal}}\" 已拉取到 {{portalDir}}",
+        "installFailed": "依赖安装没有成功完成。请在 {{portalDir}} 中手动运行 `pnpm install`。"
+      }
+    },
+    "portalSource": {
+      "errors": {
+        "workspaceNotReplaceable": "拒绝替换非 Portal 目录：{{portalDir}}\n目标目录必须为空，或包含带 nocobase 字段的 package.json。"
+      }
+    },
+    "swagger": {
+      "errors": {
+        "pluginDisabled": "API 文档插件尚未启用。请先启用该插件，再获取 Swagger 文档。",
+        "requestFailed": "Swagger 请求失败，状态码 {{status}}\n{{details}}",
+        "invalidDestinations": "swagger:getUrls 返回了无效的文档列表。",
+        "invalidDocument": "swagger:get 返回了无效的 OpenAPI 文档。"
+      },
+      "messages": {
+        "empty": "没有可用的 Swagger 文档命名空间。",
+        "saved": "Swagger 文档已保存到 {{output}}。"
+      },
+      "table": {
+        "name": "名称",
+        "namespace": "命名空间",
+        "url": "URL",
+        "field": "字段",
+        "value": "值"
+      },
+      "fields": {
+        "namespace": "命名空间",
+        "title": "标题",
+        "version": "版本",
+        "openapi": "OpenAPI",
+        "paths": "路径数"
       }
     },
     "portalInfo": {
@@ -269,9 +318,9 @@
         "name": "名称",
         "url": "访问 URL",
         "portalType": "Portal 类型",
-        "path": "本地路径",
-        "enabled": "启用",
-        "localSynced": "本地已同步"
+        "developmentPath": "开发路径",
+        "deploymentPath": "部署路径",
+        "enabled": "启用"
       }
     },
     "portalDestroy": {
@@ -280,12 +329,18 @@
         "noEnvConfigured": "还没有配置 NocoBase env。请先运行 `nb init --ui` 创建一个。",
         "confirmationRequired": "非交互模式下拒绝删除 Portal。请追加 --yes 后重试。",
         "outsideParent": "拒绝删除 {{parentDir}} 之外的 Portal：{{portalDir}}",
-        "workspaceMissing": "Portal 不存在：{{portalDir}}\n如需忽略本地文件缺失，请追加 --force。",
+        "workspaceMissing": "Portal 部署路径不存在：{{portalDir}}\n如需忽略部署文件缺失，请追加 --force。",
         "unsupportedEnvKind": "第一版暂不支持为 {{kind}} env 删除 Portal。",
+        "unsafeDevelopmentPath": "拒绝删除不安全的 Portal 开发路径：{{portalDir}}",
         "recordDestroyFailed": "Portal 记录删除失败，状态码 {{status}}\n{{details}}"
       },
       "prompts": {
-        "confirm": "删除 Portal \"{{portal}}\" 并移除它的 storage 目录？"
+        "confirm": "删除 Portal \"{{portal}}\" 并移除它的部署目录？"
+      },
+      "statuses": {
+        "deleted": "已删除",
+        "missing": "缺失",
+        "retained": "已保留"
       },
       "messages": {
         "destroyed": "Portal \"{{portal}}\" 已删除。",
@@ -293,7 +348,9 @@
         "app": "App：{{app}}",
         "base": "Base：{{base}}",
         "record": "记录：{{status}}",
-        "workspace": "Portal：{{status}}（{{dir}}）"
+        "deploymentPath": "部署路径：{{status}}（{{dir}}）",
+        "developmentPath": "开发路径：{{status}}（{{dir}}）",
+        "developmentPathMissing": "开发路径：缺失"
       }
     },
     "portalDev": {
@@ -411,7 +468,7 @@
           "betaLabel": "beta",
           "betaHint": "测试版。包含即将发布的新功能，适合提前体验和反馈。",
           "alphaLabel": "alpha",
-          "alphaHint": "开发版。功能更新最快，但可能不完整或不稳定。",
+          "alphaHint": "如果要体验 3.0 新功能，选择这个版本。",
           "otherLabel": "其他",
           "otherHint": "手动填写其他版本号、Docker tag 或 Git ref，例如分支名。"
         },
@@ -600,6 +657,15 @@
         "skipDownload": {
           "message": "跳过下载 NocoBase，直接复用已有的本地应用文件或 Docker 镜像"
         },
+        "appClientEntryMode": {
+          "message": "应用界面入口",
+          "modernOnlyLabel": "仅使用新版界面",
+          "modernOnlyHint": "只能进入新版界面，不可进入旧版界面。",
+          "modernDefaultLabel": "默认进入新版界面",
+          "modernDefaultHint": "默认进入新版界面，同时保留旧版界面入口。",
+          "legacyDefaultLabel": "默认进入旧版界面",
+          "legacyDefaultHint": "默认进入旧版界面，也可以进入新版界面。"
+        },
         "portalType": {
           "message": "Portal 类型",
           "noCodeLabel": "无代码 Portal",