@nocobase/cli 2.1.18 → 2.1.20

package/dist/lib/proxy-caddy.js

@@ -9,14 +9,17 @@
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { dockerContainerExists, dockerContainerIsRunning, startDockerContainer, stopDockerContainer, } from './app-runtime.js';
+import { loadAuthConfig } from './auth-store.js';
 import { CADDY_PROXY_DRIVER_OPTIONS, DEFAULT_CADDY_PROXY_DRIVER, getCliConfigValue, normalizeCaddyProxyDriver, resolveDockerContainerPrefix, setCliConfigValue, } from './cli-config.js';
 import { resolveCliHomeRoot } from './cli-home.js';
 import { applyEnvProxyAppEntryOptions, buildManualEnvProxyCaddyBundle, buildEnvProxyCaddyBundle, buildEnvProxyMainConfig, mapProxyPathFromCliRoot, resolveEnvProxyMainOutputPath, } from './env-proxy.js';
-import { run } from './run-npm.js';
+import { normalizeEnvProxyConfig } from './env-proxy-config.js';
+import { commandOutput, run } from './run-npm.js';
 const DOCKER_CADDY_PROXY_CONTAINER_SUFFIX = 'caddy-proxy';
 const DOCKER_CADDY_PROXY_IMAGE = 'caddy:latest';
 const DOCKER_CADDY_PROXY_RUNTIME_ROOT = '/apps';
 const DOCKER_CADDY_PROXY_CONF_DESTINATION = '/etc/caddy/Caddyfile';
+const DEFAULT_DOCKER_CADDY_PROXY_PUBLISHED_PORTS = [80, 443];
 async function readOptionalTextFile(filePath) {
     try {
         return await readFile(filePath, 'utf8');
@@ -171,11 +174,16 @@ async function reloadLocalCaddyProxy(runtimeContext) {
 }
 async function ensureDockerCaddyProxyContainer(runtimeContext) {
     const containerName = await resolveCaddyProxyContainerName();
+    const mainConfigPath = await ensureCaddyProxyMainConfig(runtimeContext);
+    const publishedPorts = await resolveDockerCaddyPublishedPorts();
     if (await dockerContainerExists(containerName)) {
-        return;
+        if (await dockerCaddyProxyContainerMatchesPublishedPorts(containerName, publishedPorts)) {
+            return;
+        }
+        await removeDockerCaddyProxyContainer(containerName);
     }
     const hostCliRoot = String(process.env.NB_CLI_ROOT ?? resolveCliHomeRoot()).trim() || resolveCliHomeRoot();
-    const mainConfigPath = await ensureCaddyProxyMainConfig(runtimeContext);
+    const dockerPortArgs = publishedPorts.flatMap((port) => ['-p', `${port}:${port}`]);
     await run('docker', [
         'run',
         '-d',
@@ -183,8 +191,7 @@ async function ensureDockerCaddyProxyContainer(runtimeContext) {
         containerName,
         '--add-host',
         'host.docker.internal:host-gateway',
-        '-p',
-        '80:80',
+        ...dockerPortArgs,
         '-v',
         `${hostCliRoot}:${DOCKER_CADDY_PROXY_RUNTIME_ROOT}`,
         '-v',
@@ -195,14 +202,53 @@ async function ensureDockerCaddyProxyContainer(runtimeContext) {
         stdio: 'ignore',
     });
 }
+async function resolveDockerCaddyPublishedPorts() {
+    const config = await loadAuthConfig();
+    const ports = new Set(DEFAULT_DOCKER_CADDY_PROXY_PUBLISHED_PORTS);
+    for (const envConfig of Object.values(config.envs)) {
+        const port = normalizeEnvProxyConfig(envConfig.proxy)?.port;
+        if (port !== undefined) {
+            ports.add(port);
+        }
+    }
+    return Array.from(ports).sort((left, right) => left - right);
+}
+async function readDockerCaddyPublishedPorts(containerName) {
+    const output = await commandOutput('docker', ['inspect', '--format', '{{json .HostConfig.PortBindings}}', containerName], { errorName: 'docker inspect' });
+    const parsed = JSON.parse(output.trim() || '{}');
+    const ports = new Set();
+    for (const bindings of Object.values(parsed)) {
+        if (!Array.isArray(bindings)) {
+            continue;
+        }
+        for (const binding of bindings) {
+            const port = Number.parseInt(String(binding?.HostPort ?? '').trim(), 10);
+            if (Number.isInteger(port) && port > 0) {
+                ports.add(port);
+            }
+        }
+    }
+    return Array.from(ports).sort((left, right) => left - right);
+}
+async function dockerCaddyProxyContainerMatchesPublishedPorts(containerName, expectedPorts) {
+    const currentPorts = await readDockerCaddyPublishedPorts(containerName);
+    return currentPorts.length === expectedPorts.length && currentPorts.every((port, index) => port === expectedPorts[index]);
+}
+async function removeDockerCaddyProxyContainer(containerName) {
+    await run('docker', ['rm', '-f', containerName], {
+        errorName: 'docker rm',
+        stdio: 'ignore',
+    });
+}
 async function startDockerCaddyProxy(runtimeContext) {
     const containerName = await resolveCaddyProxyContainerName();
     await ensureCaddyProxyMainConfig(runtimeContext);
-    if (await dockerContainerExists(containerName)) {
+    const existedBeforeEnsure = await dockerContainerExists(containerName);
+    await ensureDockerCaddyProxyContainer(runtimeContext);
+    if (existedBeforeEnsure && (await dockerContainerExists(containerName))) {
         const state = await startDockerContainer(containerName, { stdio: 'ignore' });
         return state === 'already-running' ? 'already-running' : 'started';
     }
-    await ensureDockerCaddyProxyContainer(runtimeContext);
     return 'started';
 }
 async function stopDockerCaddyProxy() {

package/dist/lib/proxy-nginx.js

@@ -9,14 +9,17 @@
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { dockerContainerExists, dockerContainerIsRunning, startDockerContainer, stopDockerContainer, } from './app-runtime.js';
+import { loadAuthConfig } from './auth-store.js';
 import { DEFAULT_NGINX_PROXY_DRIVER, getCliConfigValue, NGINX_PROXY_DRIVER_OPTIONS, normalizeNginxProxyDriver, resolveDockerContainerPrefix, setCliConfigValue, } from './cli-config.js';
 import { resolveCliHomeRoot } from './cli-home.js';
 import { applyEnvProxyAppEntryOptions, appConfigHasManagedNginxBlock, buildManualEnvProxyNginxBundle, buildEnvProxyMainConfig, buildEnvProxyNginxBundle, extractManagedNginxConfigBlock, installEnvProxyProvider, mapProxyPathFromCliRoot, reloadEnvProxyProvider, resolveEnvProxyMainOutputPath, replaceManagedNginxConfigBlock, syncEnvProxyNginxSnippets, } from './env-proxy.js';
-import { run } from './run-npm.js';
+import { normalizeEnvProxyConfig } from './env-proxy-config.js';
+import { commandOutput, run } from './run-npm.js';
 const DOCKER_NGINX_PROXY_CONTAINER_SUFFIX = 'nginx-proxy';
 const DOCKER_NGINX_PROXY_IMAGE = 'nginx:latest';
 const DOCKER_NGINX_PROXY_RUNTIME_ROOT = '/apps';
 const DOCKER_NGINX_PROXY_CONF_DESTINATION = '/etc/nginx/conf.d/default.conf';
+const DEFAULT_DOCKER_NGINX_PROXY_PUBLISHED_PORTS = [80, 443];
 async function readOptionalTextFile(filePath) {
     try {
         return await readFile(filePath, 'utf8');
@@ -231,11 +234,16 @@ async function reloadLocalNginxProxy(runtimeContext) {
 }
 async function ensureDockerNginxProxyContainer(runtimeContext) {
     const containerName = await resolveNginxProxyContainerName();
+    const mainConfigPath = await ensureNginxProxyMainConfig(runtimeContext);
+    const publishedPorts = await resolveDockerNginxPublishedPorts();
     if (await dockerContainerExists(containerName)) {
-        return;
+        if (await dockerNginxProxyContainerMatchesPublishedPorts(containerName, publishedPorts)) {
+            return;
+        }
+        await removeDockerNginxProxyContainer(containerName);
     }
     const hostCliRoot = String(process.env.NB_CLI_ROOT ?? resolveCliHomeRoot()).trim() || resolveCliHomeRoot();
-    const mainConfigPath = await ensureNginxProxyMainConfig(runtimeContext);
+    const dockerPortArgs = publishedPorts.flatMap((port) => ['-p', `${port}:${port}`]);
     await run('docker', [
         'run',
         '-d',
@@ -243,8 +251,7 @@ async function ensureDockerNginxProxyContainer(runtimeContext) {
         containerName,
         '--add-host',
         'host.docker.internal:host-gateway',
-        '-p',
-        '80:80',
+        ...dockerPortArgs,
         '-v',
         `${hostCliRoot}:${DOCKER_NGINX_PROXY_RUNTIME_ROOT}`,
         '-v',
@@ -255,14 +262,53 @@ async function ensureDockerNginxProxyContainer(runtimeContext) {
         stdio: 'ignore',
     });
 }
+async function resolveDockerNginxPublishedPorts() {
+    const config = await loadAuthConfig();
+    const ports = new Set(DEFAULT_DOCKER_NGINX_PROXY_PUBLISHED_PORTS);
+    for (const envConfig of Object.values(config.envs)) {
+        const port = normalizeEnvProxyConfig(envConfig.proxy)?.port;
+        if (port !== undefined) {
+            ports.add(port);
+        }
+    }
+    return Array.from(ports).sort((left, right) => left - right);
+}
+async function readDockerNginxPublishedPorts(containerName) {
+    const output = await commandOutput('docker', ['inspect', '--format', '{{json .HostConfig.PortBindings}}', containerName], { errorName: 'docker inspect' });
+    const parsed = JSON.parse(output.trim() || '{}');
+    const ports = new Set();
+    for (const bindings of Object.values(parsed)) {
+        if (!Array.isArray(bindings)) {
+            continue;
+        }
+        for (const binding of bindings) {
+            const port = Number.parseInt(String(binding?.HostPort ?? '').trim(), 10);
+            if (Number.isInteger(port) && port > 0) {
+                ports.add(port);
+            }
+        }
+    }
+    return Array.from(ports).sort((left, right) => left - right);
+}
+async function dockerNginxProxyContainerMatchesPublishedPorts(containerName, expectedPorts) {
+    const currentPorts = await readDockerNginxPublishedPorts(containerName);
+    return currentPorts.length === expectedPorts.length && currentPorts.every((port, index) => port === expectedPorts[index]);
+}
+async function removeDockerNginxProxyContainer(containerName) {
+    await run('docker', ['rm', '-f', containerName], {
+        errorName: 'docker rm',
+        stdio: 'ignore',
+    });
+}
 async function startDockerNginxProxy(runtimeContext) {
     const containerName = await resolveNginxProxyContainerName();
     await ensureNginxProxyMainConfig(runtimeContext);
-    if (await dockerContainerExists(containerName)) {
+    const existedBeforeEnsure = await dockerContainerExists(containerName);
+    await ensureDockerNginxProxyContainer(runtimeContext);
+    if (existedBeforeEnsure && (await dockerContainerExists(containerName))) {
         const state = await startDockerContainer(containerName, { stdio: 'ignore' });
         return state === 'already-running' ? 'already-running' : 'started';
     }
-    await ensureDockerNginxProxyContainer(runtimeContext);
     return 'started';
 }
 async function stopDockerNginxProxy() {

package/dist/locale/en-US.json

@@ -93,20 +93,20 @@
     "envAdd": {
       "prompts": {
         "name": {
-          "message": "What would you like to call this environment?",
+          "message": "App environment identifier",
           "placeholder": "default"
         },
         "scope": {
-          "message": "Where should this connection be saved?",
+          "message": "Connection save location",
           "globalLabel": "Global",
           "globalHint": "user-level config"
         },
         "apiBaseUrl": {
-          "message": "What is the API base URL?",
+          "message": "API base URL",
           "placeholder": "https://demo.example.com/api or https://demo.example.com/api/__app/<subapp>"
         },
         "authType": {
-          "message": "Which authentication method would you like to use?",
+          "message": "Authentication method",
           "basicLabel": "Basic authentication (username + password)",
           "basicHint": "uses your credentials to fetch a token after save",
           "oauthLabel": "OAuth (browser authentication)",
@@ -114,14 +114,14 @@
           "tokenLabel": "API token / API key"
         },
         "username": {
-          "message": "Enter the username for basic login",
+          "message": "Basic login username",
           "placeholder": "admin"
         },
         "password": {
-          "message": "Enter the password for basic login"
+          "message": "Basic login password"
         },
         "accessToken": {
-          "message": "Enter an API token or API key",
+          "message": "API token or API key",
           "placeholder": "Enter your API token / API key"
         }
       }
@@ -179,7 +179,7 @@
           },
           "prompts": {
             "provideMethod": {
-              "message": "How do you want to provide the license key?",
+              "message": "License key input method",
               "keyOption": "Paste the license key",
               "fileOption": "Read the key from a file"
             },
@@ -252,7 +252,7 @@
       },
       "prompts": {
         "source": {
-          "message": "How would you like to get NocoBase?",
+          "message": "NocoBase install source",
           "dockerLabel": "Docker install (Recommended)",
           "dockerHint": "Best for no-code and low-maintenance setups. You can upgrade later by pulling a newer image and restarting the app.",
           "npmLabel": "create-nocobase-app install",
@@ -261,7 +261,7 @@
           "gitHint": "Best when you want to try the latest unreleased changes, contribute code, or debug and modify NocoBase source directly. This option is more developer-oriented."
         },
         "version": {
-          "message": "Which version would you like to use?",
+          "message": "NocoBase version",
           "latestLabel": "latest",
           "latestHint": "Stable release. Best for production use and the most predictable experience.",
           "betaLabel": "beta",
@@ -272,15 +272,15 @@
           "otherHint": "Enter another package version, Docker tag, or Git ref manually, such as a branch name."
         },
         "otherVersion": {
-          "message": "Enter the version, Docker tag, or Git ref you want to use.",
+          "message": "Custom version, Docker tag, or Git ref",
           "placeholder": "For example: fix/cli-v2"
         },
         "dockerRegistry": {
-          "message": "Which Docker registry would you like to use? The image tag is set separately in Version.",
+          "message": "Docker registry (image tag is set in Version)",
           "placeholder": "nocobase/nocobase"
         },
         "dockerPlatform": {
-          "message": "Which Docker image platform should be used?",
+          "message": "Architecture",
           "autoLabel": "Auto",
           "autoHint": "Use Docker default for this machine"
         },
@@ -323,79 +323,79 @@
       },
       "prompts": {
         "env": {
-          "message": "What would you like to call this app?",
+          "message": "App environment identifier",
           "placeholder": "local"
         },
         "lang": {
-          "message": "Which language would you like to use for the app?"
+          "message": "App language"
         },
         "appPath": {
-          "message": "Where should this app be stored? (relative to {{root}})",
+          "message": "App directory (relative to {{root}})",
           "placeholder": "./<env>/"
         },
         "appPort": {
-          "message": "Which port should this app use?",
+          "message": "App port",
           "placeholder": "13000"
         },
         "appPublicPath": {
-          "message": "What is the app subpath? (for example, /nocobase/)",
+          "message": "App subpath (for example, /nocobase/)",
           "placeholder": "/ or /nocobase/"
         },
         "storagePath": {
-          "message": "Where should uploads and local files be stored?",
+          "message": "Uploads and local files directory",
           "placeholder": "./<env>/storage/"
         },
         "dbDialect": {
-          "message": "Which database would you like to use?"
+          "message": "Database type"
         },
         "builtinDb": {
-          "message": "Would you like to use the built-in database?"
+          "message": "Use built-in database"
         },
         "builtinDbImage": {
-          "message": "Which Docker image should be used for the built-in database?",
+          "message": "Built-in database Docker image",
           "placeholder": "postgres:16"
         },
         "dbHost": {
-          "message": "What is the database host?",
+          "message": "Database host",
           "placeholder": "127.0.0.1"
         },
         "dbPort": {
-          "message": "What is the database port?",
+          "message": "Database port",
           "placeholder": "5432"
         },
         "dbDatabase": {
-          "message": "What is the database name?"
+          "message": "Database name"
         },
         "dbUser": {
-          "message": "What is the database username?"
+          "message": "Database username"
         },
         "dbPassword": {
-          "message": "What is the database password?"
+          "message": "Database password"
         },
         "dbSchema": {
-          "message": "What is the database schema? (PostgreSQL only, optional)",
+          "message": "Database schema (PostgreSQL/KingbaseES only, optional)",
           "placeholder": "Leave empty to use the default schema"
         },
         "dbTablePrefix": {
-          "message": "What table prefix should be used? (optional)",
+          "message": "Database table prefix (optional)",
           "placeholder": "For example: nb_"
         },
         "dbUnderscored": {
-          "message": "Use underscored names for database tables and columns?"
+          "message": "Use underscored names for database tables and columns"
         },
         "rootUsername": {
-          "message": "Choose the initial admin username",
+          "message": "Initial admin username",
           "placeholder": "nocobase"
         },
         "rootEmail": {
-          "message": "What is the initial admin email?",
+          "message": "Initial admin email",
           "placeholder": "admin@nocobase.com"
         },
         "rootPassword": {
-          "message": "Choose the initial admin password"
+          "message": "Initial admin password"
         },
         "rootNickname": {
-          "message": "What display name should the initial admin use?",
+          "message": "Initial admin display name",
           "placeholder": "Super Admin"
         }
       }
@@ -419,11 +419,11 @@
       },
       "prompts": {
         "appName": {
-          "message": "What should this environment use for `--env`?",
+          "message": "Unique app environment identifier (used by the CLI to locate and manage this environment)",
           "placeholder": "local"
         },
         "setupMode": {
-          "message": "How would you like to set up this environment?",
+          "message": "App environment setup method",
           "installNewLabel": "Install a new app",
           "installNewHint": "Install a brand-new app from scratch. Best for first-time setup, evaluation, or a fresh local environment.",
           "manageLocalLabel": "Manage an app already on this machine",
@@ -432,7 +432,7 @@
           "connectRemoteHint": "Save only the remote app connection. Nothing will be installed or taken over on this machine."
         },
         "installSkills": {
-          "message": "Install NocoBase AI coding skills (nocobase/skills)?"
+          "message": "Install NocoBase AI coding skills (nocobase/skills)"
         },
         "apiBaseUrl": {
           "message": "API base URL",

package/dist/locale/zh-CN.json

@@ -93,20 +93,20 @@
     "envAdd": {
       "prompts": {
         "name": {
-          "message": "你想如何命名这个环境？",
+          "message": "应用环境标识",
           "placeholder": "default"
         },
         "scope": {
-          "message": "这个连接要保存到哪里？",
+          "message": "连接保存位置",
           "globalLabel": "全局",
           "globalHint": "保存在用户级配置中"
         },
         "apiBaseUrl": {
-          "message": "API 基础地址是什么？",
+          "message": "API 基础地址",
           "placeholder": "https://demo.example.com/api 或 https://demo.example.com/api/__app/<subapp>"
         },
         "authType": {
-          "message": "你想使用哪种认证方式？",
+          "message": "认证方式",
           "basicLabel": "Basic 认证（用户名 + 密码）",
           "basicHint": "保存后会用用户名和密码换取 Token",
           "oauthLabel": "OAuth（浏览器认证）",
@@ -114,14 +114,14 @@
           "tokenLabel": "API Token / API Key"
         },
         "username": {
-          "message": "请输入 Basic 登录用户名",
+          "message": "Basic 登录用户名",
           "placeholder": "admin"
         },
         "password": {
-          "message": "请输入 Basic 登录密码"
+          "message": "Basic 登录密码"
         },
         "accessToken": {
-          "message": "请输入 API Token 或 API Key",
+          "message": "API Token 或 API Key",
           "placeholder": "请输入你的 API Token / API Key"
         }
       }
@@ -179,7 +179,7 @@
           },
           "prompts": {
             "provideMethod": {
-              "message": "你想通过哪种方式提供 license key？",
+              "message": "License key 提供方式",
               "keyOption": "直接粘贴 license key",
               "fileOption": "从文件读取 key"
             },
@@ -252,7 +252,7 @@
       },
       "prompts": {
         "source": {
-          "message": "你想通过哪种方式获取 NocoBase？",
+          "message": "NocoBase 获取方式",
           "dockerLabel": "Docker 安装（推荐）",
           "dockerHint": "适合无代码或低维护成本场景。后续升级时，拉取新镜像并重启应用即可。",
           "npmLabel": "create-nocobase-app 安装",
@@ -261,7 +261,7 @@
           "gitHint": "适合体验最新未发布版本、参与贡献，或直接修改和调试 NocoBase 源码。这个方式更偏向开发者使用。"
         },
         "version": {
-          "message": "你想使用哪个版本？",
+          "message": "NocoBase 版本",
           "latestLabel": "latest",
           "latestHint": "稳定版。适合生产环境和希望获得稳定体验的场景。",
           "betaLabel": "beta",
@@ -272,15 +272,15 @@
           "otherHint": "手动填写其他版本号、Docker tag 或 Git ref，例如分支名。"
         },
         "otherVersion": {
-          "message": "请输入你想使用的版本号、Docker tag 或 Git ref。",
+          "message": "自定义版本号、Docker tag 或 Git ref",
           "placeholder": "例如：fix/cli-v2"
         },
         "dockerRegistry": {
-          "message": "你想使用哪个 Docker registry？镜像 tag 请单独在 Version 中填写。",
+          "message": "Docker registry（镜像 tag 在版本中单独设置）",
           "placeholder": "registry.cn-shanghai.aliyuncs.com/nocobase/nocobase"
         },
         "dockerPlatform": {
-          "message": "要使用哪个 Docker 镜像平台？",
+          "message": "架构",
           "autoLabel": "自动",
           "autoHint": "由 Docker 根据当前机器自动选择"
         },
@@ -323,79 +323,79 @@
       },
       "prompts": {
         "env": {
-          "message": "你想如何命名这个应用？",
+          "message": "应用环境标识",
           "placeholder": "local"
         },
         "lang": {
-          "message": "你希望应用使用哪种语言？"
+          "message": "应用语言"
         },
         "appPath": {
-          "message": "应用要放到哪里？（相对路径基于 {{root}}）",
+          "message": "应用目录（相对路径基于 {{root}}）",
           "placeholder": "./<env>/"
         },
         "appPort": {
-          "message": "应用要使用哪个端口？",
+          "message": "应用端口",
           "placeholder": "13000"
         },
         "appPublicPath": {
-          "message": "应用的子路径是什么？（例如 /nocobase/）",
+          "message": "应用子路径（例如 /nocobase/）",
           "placeholder": "/ 或 /nocobase/"
         },
         "storagePath": {
-          "message": "上传文件和本地存储目录要放到哪里？",
+          "message": "上传文件和本地存储目录",
           "placeholder": "./<env>/storage/"
         },
         "dbDialect": {
-          "message": "你想使用哪种数据库？"
+          "message": "数据库类型"
         },
         "builtinDb": {
-          "message": "是否使用内置数据库？"
+          "message": "使用内置数据库"
         },
         "builtinDbImage": {
-          "message": "内置数据库要使用哪个 Docker 镜像？",
+          "message": "内置数据库 Docker 镜像",
           "placeholder": "postgres:16"
         },
         "dbHost": {
-          "message": "数据库主机地址是什么？",
+          "message": "数据库主机地址",
           "placeholder": "127.0.0.1"
         },
         "dbPort": {
-          "message": "数据库端口是什么？",
+          "message": "数据库端口",
           "placeholder": "5432"
         },
         "dbDatabase": {
-          "message": "数据库名称是什么？"
+          "message": "数据库名称"
         },
         "dbUser": {
-          "message": "数据库用户名是什么？"
+          "message": "数据库用户名"
         },
         "dbPassword": {
-          "message": "数据库密码是什么？"
+          "message": "数据库密码"
         },
         "dbSchema": {
-          "message": "数据库 schema 是什么？（仅 PostgreSQL，可选）",
+          "message": "数据库 schema（仅 PostgreSQL/KingbaseES，可选）",
           "placeholder": "留空则使用默认 schema"
         },
         "dbTablePrefix": {
-          "message": "要使用什么数据表前缀？（可选）",
+          "message": "数据表前缀（可选）",
           "placeholder": "例如：nb_"
         },
         "dbUnderscored": {
-          "message": "数据库表名和字段名是否使用下划线风格？"
+          "message": "数据库表名和字段名使用下划线风格"
         },
         "rootUsername": {
-          "message": "设置初始管理员用户名",
+          "message": "初始管理员用户名",
           "placeholder": "nocobase"
         },
         "rootEmail": {
-          "message": "初始管理员邮箱是什么？",
+          "message": "初始管理员邮箱",
           "placeholder": "admin@nocobase.com"
         },
         "rootPassword": {
-          "message": "设置初始管理员密码"
+          "message": "初始管理员密码"
         },
         "rootNickname": {
-          "message": "初始管理员显示名称是什么？",
+          "message": "初始管理员显示名称",
           "placeholder": "Super Admin"
         }
       }
@@ -419,11 +419,11 @@
       },
       "prompts": {
         "appName": {
-          "message": "这个环境要使用什么 `--env` 标识？",
+          "message": "应用环境唯一标识（CLI 将通过该标识定位并操作对应环境）",
           "placeholder": "local"
         },
         "setupMode": {
-          "message": "你想用哪种方式配置这个环境？",
+          "message": "应用环境配置方式",
           "installNewLabel": "新安装",
           "installNewHint": "从零安装一个新的应用，适合首次部署、试用或新建本地开发环境。",
           "manageLocalLabel": "本机接管",
@@ -432,7 +432,7 @@
           "connectRemoteHint": "只保存远程应用的连接信息，不在本机安装或接管应用。"
         },
         "installSkills": {
-          "message": "是否安装 NocoBase AI coding skills（nocobase/skills）？"
+          "message": "安装 NocoBase AI coding skills（nocobase/skills）"
         },
         "apiBaseUrl": {
           "message": "API 基础地址",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.18",
+  "version": "2.1.20",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -144,5 +144,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "2234b42b21c96d22a4b65a1f16a65ae61f434779"
+  "gitHead": "ca646ba28bb11da083e3436866552932ed780b6f"
 }