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

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

@@ -11,6 +11,17 @@ import { exit, stdin as stdinStream, stdout as stdoutStream } from 'node:process
 import { createCliTranslate } from "./cli-locale.js";
 import { confirm, select, input, password } from "./inquirer.js";
 import { createPromptCatalogHooks, hasIvKey, isBlankText, isPromptBlockSkipped, mergedBoolean, mergedInteger, mergedPassword, mergedSelect, mergedText, resolvePromptCatalogLocale, resolvePromptText, runPromptFieldValidate, selectOptionValues, tryApplyPreset, } from "./prompt-catalog-core.js";
+function buildPromptComputationSeed(catalog, initialValues) {
+    const catalogKeys = new Set(Object.keys(catalog));
+    const seed = {};
+    for (const [key, value] of Object.entries(initialValues)) {
+        if (catalogKeys.has(key) || value === undefined || value === null) {
+            continue;
+        }
+        seed[key] = value;
+    }
+    return seed;
+}
 function adaptInquirerValidate(validate) {
     if (!validate) {
         return undefined;
@@ -113,14 +124,16 @@ export async function runPromptCatalog(catalog, options = {}) {
     const hooks = createTerminalHooks(locale, options.hooks);
     const interactive = Boolean(stdinStream.isTTY && stdoutStream.isTTY && !options.yes);
     const preset = options.values ?? {};
+    const computationSeed = buildPromptComputationSeed(catalog, resolveIv);
     const out = {};
     const renderer = createInquirerRenderer();
     for (const [key, def] of Object.entries(catalog)) {
-        if (isPromptBlockSkipped(def, out)) {
+        const valuesSoFar = { ...computationSeed, ...out };
+        if (isPromptBlockSkipped(def, valuesSoFar)) {
             continue;
         }
         if (tryApplyPreset(key, def, preset, out, hooks, locale)) {
-            const errV = await runPromptFieldValidate(def, out[key], out);
+            const errV = await runPromptFieldValidate(def, out[key], { ...computationSeed, ...out });
             if (errV) {
                 hooks.onMissingNonInteractive(errV);
             }
@@ -135,7 +148,7 @@ export async function runPromptCatalog(catalog, options = {}) {
             continue;
         }
         if (def.type === 'run') {
-            await def.run(out, options.command);
+            await def.run({ ...computationSeed, ...out }, options.command);
             continue;
         }
         if (def.type === 'text') {
@@ -144,18 +157,18 @@ export async function runPromptCatalog(catalog, options = {}) {
                 ? resolvePromptText(def.placeholder, locale)
                 : undefined;
             if (!interactive) {
-                const merged = mergedText(key, def, resolveIv, useYesInitial, out);
+                const merged = mergedText(key, def, resolveIv, useYesInitial, valuesSoFar);
                 if (def.required && isBlankText(merged)) {
                     hooks.onMissingNonInteractive(t('promptCatalog.nonInteractive.textRequired', { key }));
                 }
                 out[key] = merged;
-                const errT = await runPromptFieldValidate(def, merged, { ...out, [key]: merged });
+                const errT = await runPromptFieldValidate(def, merged, { ...computationSeed, ...out, [key]: merged });
                 if (errT) {
                     hooks.onMissingNonInteractive(errT);
                 }
                 continue;
             }
-            const merged = mergedText(key, def, promptIv, false, out);
+            const merged = mergedText(key, def, promptIv, false, valuesSoFar);
             const raw = await callPrompt(() => renderer.text({
                 message,
                 initialValue: merged,
@@ -168,7 +181,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                         return undefined;
                     }
                     const currentValue = typeof value === 'string' ? value : String(value ?? '');
-                    const result = runPromptFieldValidate(def, currentValue, { ...out, [key]: currentValue });
+                    const result = runPromptFieldValidate(def, currentValue, { ...computationSeed, ...out, [key]: currentValue });
                     return result;
                 },
             }), renderer, hooks);
@@ -180,7 +193,7 @@ export async function runPromptCatalog(catalog, options = {}) {
             if (!interactive) {
                 const b = mergedBoolean(key, def, resolveIv, useYesInitial);
                 out[key] = b;
-                const errB = await runPromptFieldValidate(def, b, { ...out, [key]: b });
+                const errB = await runPromptFieldValidate(def, b, { ...computationSeed, ...out, [key]: b });
                 if (errB) {
                     hooks.onMissingNonInteractive(errB);
                 }
@@ -191,7 +204,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                 for (;;) {
                     const raw = await callPrompt(() => renderer.confirm({ message, initialValue: merged }), renderer, hooks);
                     const b = Boolean(raw);
-                    const errB = await runPromptFieldValidate(def, b, { ...out, [key]: b });
+                    const errB = await runPromptFieldValidate(def, b, { ...computationSeed, ...out, [key]: b });
                     if (errB) {
                         renderer.error(errB);
                         continue;
@@ -224,7 +237,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                         : t('promptCatalog.nonInteractive.selectMissingDefault', { key }));
                 }
                 out[key] = merged;
-                const errS = await runPromptFieldValidate(def, merged, { ...out, [key]: merged });
+                const errS = await runPromptFieldValidate(def, merged, { ...computationSeed, ...out, [key]: merged });
                 if (errS) {
                     hooks.onMissingNonInteractive(errS);
                 }
@@ -248,7 +261,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                         initialValue: uiInitial,
                     }), renderer, hooks);
                     const picked = raw;
-                    const errS = await runPromptFieldValidate(def, picked, { ...out, [key]: picked });
+                    const errS = await runPromptFieldValidate(def, picked, { ...computationSeed, ...out, [key]: picked });
                     if (errS) {
                         renderer.error(errS);
                         continue;
@@ -269,13 +282,13 @@ export async function runPromptCatalog(catalog, options = {}) {
         if (def.type === 'password') {
             const message = resolvePromptText(def.message, locale, key);
             if (!interactive) {
-                const merged = mergedPassword(key, def, resolveIv, useYesInitial);
+                const merged = mergedPassword(key, def, resolveIv, useYesInitial, valuesSoFar);
                 if (merged === undefined) {
                     if (def.required) {
                         hooks.onMissingNonInteractive(t('promptCatalog.nonInteractive.passwordRequired', { key }));
                     }
                     out[key] = '';
-                    const errPE = await runPromptFieldValidate(def, '', { ...out, [key]: '' });
+                    const errPE = await runPromptFieldValidate(def, '', { ...computationSeed, ...out, [key]: '' });
                     if (errPE) {
                         hooks.onMissingNonInteractive(errPE);
                     }
@@ -285,7 +298,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                     hooks.onMissingNonInteractive(t('promptCatalog.nonInteractive.passwordRequiredNonEmpty', { key }));
                 }
                 out[key] = merged;
-                const errP = await runPromptFieldValidate(def, merged, { ...out, [key]: merged });
+                const errP = await runPromptFieldValidate(def, merged, { ...computationSeed, ...out, [key]: merged });
                 if (errP) {
                     hooks.onMissingNonInteractive(errP);
                 }
@@ -302,7 +315,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                         return undefined;
                     }
                     const currentValue = typeof value === 'string' ? value : String(value ?? '');
-                    const result = runPromptFieldValidate(def, currentValue, { ...out, [key]: currentValue });
+                    const result = runPromptFieldValidate(def, currentValue, { ...computationSeed, ...out, [key]: currentValue });
                     return result;
                 },
             }), renderer, hooks);
@@ -322,14 +335,14 @@ export async function runPromptCatalog(catalog, options = {}) {
                     }
                     const z = def.initialValue ?? 0;
                     out[key] = z;
-                    const errI = await runPromptFieldValidate(def, z, { ...out, [key]: z });
+                    const errI = await runPromptFieldValidate(def, z, { ...computationSeed, ...out, [key]: z });
                     if (errI) {
                         hooks.onMissingNonInteractive(errI);
                     }
                     continue;
                 }
                 out[key] = merged;
-                const errI2 = await runPromptFieldValidate(def, merged, { ...out, [key]: merged });
+                const errI2 = await runPromptFieldValidate(def, merged, { ...computationSeed, ...out, [key]: merged });
                 if (errI2) {
                     hooks.onMissingNonInteractive(errI2);
                 }
@@ -349,7 +362,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                         }
                         if (def.validate) {
                             const z = def.initialValue ?? 0;
-                            return runPromptFieldValidate(def, z, { ...out, [key]: z });
+                            return runPromptFieldValidate(def, z, { ...computationSeed, ...out, [key]: z });
                         }
                         return undefined;
                     }
@@ -360,7 +373,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                         return undefined;
                     }
                     const n = Number.parseInt(trimmed, 10);
-                    return runPromptFieldValidate(def, n, { ...out, [key]: n });
+                    return runPromptFieldValidate(def, n, { ...computationSeed, ...out, [key]: n });
                 },
             }), renderer, hooks);
             if (typeof raw === 'string' && raw.trim() === '' && !def.required) {

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

@@ -48,13 +48,24 @@ function isInputBlock(def) {
         def.type === 'password' ||
         def.type === 'integer');
 }
+function buildPromptComputationSeed(catalog, userPreset) {
+    const catalogKeys = new Set(Object.keys(catalog));
+    const seed = {};
+    for (const [key, value] of Object.entries(userPreset)) {
+        if (catalogKeys.has(key) || value === undefined || value === null) {
+            continue;
+        }
+        seed[key] = value;
+    }
+    return seed;
+}
 /**
  * Merges CLI/env **`userPreset`** with catalog block defaults, in the same key order and with the
  * same `hidden` / `run` semantics as {@link isPromptBlockSkipped}, so the web form can prefill
  * and reflow `hidden` fields (e.g. `integer` when `select` changes).
  */
 export function buildWebFormValuesFromCatalog(catalog, userPreset = {}) {
-    const out = {};
+    const out = buildPromptComputationSeed(catalog, userPreset);
     for (const [key, def] of Object.entries(catalog)) {
         if (def.type === 'intro' || def.type === 'outro') {
             continue;
@@ -109,7 +120,7 @@ function defaultValueForInput(key, def, out) {
  * from current raw form data (e.g. after changing `select`). Matches how {@link isPromptBlockSkipped} uses `out` while iterating the catalog.
  */
 export function reflowWebFormState(catalog, raw, userSeed = {}) {
-    const out = {};
+    const out = buildPromptComputationSeed(catalog, userSeed);
     const show = {};
     for (const [key, def] of Object.entries(catalog)) {
         if (def.type === 'intro' || def.type === 'outro') {

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",