@nocobase/cli 2.1.0-alpha.45 → 2.1.0-alpha.47

package/dist/lib/startup-update.js

@@ -10,6 +10,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { confirm } from "./inquirer.js";
+import { DEFAULT_UPDATE_POLICY, getExplicitCliConfigValue, loadCliConfig, } from './cli-config.js';
 import { inspectSelfInstall, inspectSelfStatus, } from './self-manager.js';
 import { inspectSkillsStatus } from './skills-manager.js';
 import { resolveCliHomeDir } from './cli-home.js';
@@ -83,39 +84,53 @@ async function writeCurrentInstallEntry(updater) {
     const state = await readState();
     const installBinPath = getCurrentInstallBinPath();
     const nextEntry = updater(getCurrentInstallEntry(state), state);
+    const entries = {
+        ...(state.entries ?? {}),
+    };
+    if (nextEntry?.policy || nextEntry?.lastCheckedDate) {
+        entries[installBinPath] = nextEntry;
+    }
+    else {
+        delete entries[installBinPath];
+    }
     await writeState({
         ...state,
-        entries: {
-            ...(state.entries ?? {}),
-            [installBinPath]: nextEntry,
-        },
+        entries: Object.keys(entries).length ? entries : undefined,
     });
 }
 async function markChecked(now = new Date()) {
-    await writeCurrentInstallEntry((current, state) => {
+    await writeCurrentInstallEntry((current) => {
         return {
-            policy: current?.policy ?? 'daily',
+            ...current,
             lastCheckedDate: todayStamp(now),
         };
     });
 }
-async function disableStartupUpdateForCurrentInstall() {
-    await writeCurrentInstallEntry((current, state) => {
-        return {
-            policy: 'disabled',
-            lastCheckedDate: current?.lastCheckedDate
-                ?? state.lastCheckedDate,
-        };
-    });
+function resolveLegacyStartupUpdatePolicy(state) {
+    const policy = getCurrentInstallEntry(state)?.policy;
+    if (policy === 'disabled') {
+        return 'off';
+    }
+    if (policy === 'daily') {
+        return 'prompt';
+    }
+    return undefined;
 }
-async function enableDailyStartupUpdateForCurrentInstall() {
-    await writeCurrentInstallEntry((current, state) => {
-        return {
-            policy: 'daily',
-            lastCheckedDate: current?.lastCheckedDate
-                ?? state.lastCheckedDate,
-        };
-    });
+async function resolveStartupUpdatePolicy(state) {
+    const config = await loadCliConfig({ scope: 'global' });
+    const explicit = getExplicitCliConfigValue(config, 'update.policy');
+    return explicit ?? resolveLegacyStartupUpdatePolicy(state) ?? DEFAULT_UPDATE_POLICY;
+}
+export async function clearLegacyStartupUpdatePolicyForCurrentInstall() {
+    const state = await readState();
+    const current = getCurrentInstallEntry(state);
+    if (!current?.policy) {
+        return false;
+    }
+    await writeCurrentInstallEntry(() => ({
+        lastCheckedDate: current.lastCheckedDate,
+    }));
+    return true;
 }
 export async function shouldRunStartupUpdateCheck(argv, now = new Date()) {
     if (process.env[NB_SKIP_STARTUP_UPDATE_ENV] === '1') {
@@ -125,19 +140,14 @@ export async function shouldRunStartupUpdateCheck(argv, now = new Date()) {
         return false;
     }
     const state = await readState();
-    const currentEntry = getCurrentInstallEntry(state);
-    if (currentEntry?.policy === 'disabled') {
+    const policy = await resolveStartupUpdatePolicy(state);
+    if (policy === 'off') {
         return false;
     }
-    if (currentEntry?.policy === 'daily') {
-        return readCurrentInstallLastCheckedDate(state) !== todayStamp(now);
-    }
     const selfInstall = await inspectSelfInstall();
     if (!shouldEnableStartupUpdateForInstallMethod(selfInstall.installMethod)) {
-        await disableStartupUpdateForCurrentInstall();
         return false;
     }
-    await enableDailyStartupUpdateForCurrentInstall();
     return readCurrentInstallLastCheckedDate(state) !== todayStamp(now);
 }
 export function shouldEnableStartupUpdateForInstallMethod(installMethod) {
@@ -189,14 +199,13 @@ function buildPromptMessage(selfStatus, skillsStatus) {
     return lines.join('\n');
 }
 function buildUpdateCommands(selfStatus, skillsStatus) {
-    const commands = [];
     if (selfStatus.updateAvailable && selfStatus.updatable) {
-        commands.push('nb self update --yes');
+        return [skillsStatus.updateAvailable === true ? 'nb self update --yes --skills' : 'nb self update --yes'];
     }
     if (skillsStatus.updateAvailable === true) {
-        commands.push('nb skills update --yes');
+        return ['nb skills update --yes'];
     }
-    return commands;
+    return [];
 }
 function buildNonInteractiveWarning(selfStatus, skillsStatus) {
     const commands = buildUpdateCommands(selfStatus, skillsStatus);
@@ -233,26 +242,36 @@ function buildDeclinedWarning(selfStatus, skillsStatus) {
         'You may run into compatibility issues until you update.',
     ].join(' ');
 }
-async function runStartupUpdates() {
-    await run('nb', ['self', 'update', '--yes'], {
-        stdio: 'inherit',
-        env: {
-            [NB_SKIP_STARTUP_UPDATE_ENV]: '1',
-        },
-        errorName: 'nb self update',
-    });
-    await run('nb', ['skills', 'update', '--yes'], {
-        stdio: 'inherit',
-        env: {
-            [NB_SKIP_STARTUP_UPDATE_ENV]: '1',
-        },
-        errorName: 'nb skills update',
-    });
+async function runStartupUpdates(selfStatus, skillsStatus) {
+    if (selfStatus.updateAvailable && selfStatus.updatable) {
+        const args = ['self', 'update', '--yes'];
+        if (skillsStatus.updateAvailable === true) {
+            args.push('--skills');
+        }
+        await run('nb', args, {
+            stdio: 'inherit',
+            env: {
+                [NB_SKIP_STARTUP_UPDATE_ENV]: '1',
+            },
+            errorName: 'nb self update',
+        });
+        return;
+    }
+    if (skillsStatus.updateAvailable === true) {
+        await run('nb', ['skills', 'update', '--yes'], {
+            stdio: 'inherit',
+            env: {
+                [NB_SKIP_STARTUP_UPDATE_ENV]: '1',
+            },
+            errorName: 'nb skills update',
+        });
+    }
 }
-export async function maybeRunStartupUpdatePrompt(argv) {
+export async function maybeRunStartupUpdate(argv) {
     if (!(await shouldRunStartupUpdateCheck(argv))) {
         return { kind: 'skipped' };
     }
+    const policy = await resolveStartupUpdatePolicy(await readState());
     const selfStatus = await inspectSelfStatus();
     const skillsStatus = await inspectSkillsStatus();
     if (!hasPendingUpdates(selfStatus, skillsStatus)) {
@@ -264,6 +283,11 @@ export async function maybeRunStartupUpdatePrompt(argv) {
         await markChecked();
         return { kind: 'warned' };
     }
+    if (policy === 'auto') {
+        await runStartupUpdates(selfStatus, skillsStatus);
+        await markChecked();
+        return { kind: 'updated' };
+    }
     let answer = false;
     try {
         answer = await confirm({
@@ -279,7 +303,7 @@ export async function maybeRunStartupUpdatePrompt(argv) {
         await markChecked();
         return { kind: 'declined' };
     }
-    await runStartupUpdates();
+    await runStartupUpdates(selfStatus, skillsStatus);
     await markChecked();
     return { kind: 'updated' };
 }

package/dist/lib/ui.js

@@ -9,6 +9,7 @@
 import { stdin as input, stdout as output } from 'node:process';
 import ora from 'ora';
 import pc from 'picocolors';
+import { translateCli } from './cli-locale.js';
 let activeSpinner;
 let verboseMode = false;
 let lastStaticTaskMessage;
@@ -57,7 +58,7 @@ export function announceTargetEnv(envName) {
     if (process.env.NB_SKIP_TARGET_ENV_LOG === '1') {
         return;
     }
-    printInfo(`Using env "${envName}".`);
+    printInfo(translateCli('commands.shared.targetEnv', { envName }));
 }
 export function printVerbose(message) {
     if (!verboseMode) {

package/dist/locale/en-US.json

@@ -63,6 +63,9 @@
     "envKey": {
       "invalid": "Use letters and numbers only."
     },
+    "appPublicPath": {
+      "invalid": "Use / or a slash-separated path like /nocobase/ or /foo-bar/baz_2/. Each path segment may contain letters, numbers, hyphens, and underscores only."
+    },
     "tcpPort": {
       "invalid": "Enter a valid TCP port between 1 and 65535, for example {{example}}.",
       "allocateFailed": "Failed to allocate an available TCP port.",
@@ -96,10 +99,10 @@
           "placeholder": "https://demo.example.com/api or https://demo.example.com/api/__app/<subapp>"
         },
         "authType": {
-          "message": "How would you like to sign in?",
-          "basicLabel": "Basic login (username + password)",
+          "message": "Which authentication method would you like to use?",
+          "basicLabel": "Basic authentication (username + password)",
           "basicHint": "uses your credentials to fetch a token after save",
-          "oauthLabel": "OAuth (browser login)",
+          "oauthLabel": "OAuth (browser authentication)",
           "oauthHint": "runs nb env auth after save",
           "tokenLabel": "API token / API key"
         },
@@ -116,8 +119,91 @@
         }
       }
     },
+    "envProxy": {
+      "messages": {
+        "generating": "Generating proxy config for env \"{{envName}}\"...",
+        "printed": "Printed proxy config for env \"{{envName}}\".",
+        "saved": "Saved generated proxy config for env \"{{envName}}\" at {{outputPath}}.",
+        "savedWithAppEntryCreated": "Saved generated proxy config for env \"{{envName}}\" at {{outputPath}}, and created editable app entry config at {{appConfigPath}}.",
+        "savedWithAppEntryMigrated": "Saved generated proxy config for env \"{{envName}}\" at {{outputPath}}, and migrated the app entry config at {{appConfigPath}}.",
+        "savedNginxBundleCreated": "Saved nginx proxy files for env \"{{envName}}\" under {{entryDir}}, and created editable app entry config at {{appConfigPath}}.",
+        "savedNginxBundleUpdated": "Saved nginx proxy files for env \"{{envName}}\" under {{entryDir}}, and refreshed editable app entry config at {{appConfigPath}}.",
+        "savedCaddyBundleCreated": "Saved caddy proxy files for env \"{{envName}}\" under {{entryDir}}, and created editable app entry config at {{appConfigPath}}.",
+        "savedCaddyBundleMigrated": "Saved caddy proxy files for env \"{{envName}}\" under {{entryDir}}, and migrated the app entry config at {{appConfigPath}}.",
+        "savedCaddyBundleUpdated": "Saved caddy proxy files for env \"{{envName}}\" under {{entryDir}}, and refreshed editable app entry config at {{appConfigPath}}.",
+        "failed": "Failed to generate proxy config for env \"{{envName}}\".",
+        "installingProvider": "Installing the shared proxy config into {{provider}}...",
+        "providerInstalled": "Installed the shared proxy config into the {{provider}} main config at {{configPath}}.",
+        "providerAlreadyInstalled": "The shared proxy config is already installed in the {{provider}} main config at {{configPath}}.",
+        "installProviderFailed": "Failed to install the shared proxy config into {{provider}}.",
+        "reloadingProvider": "Validating and reloading {{provider}}...",
+        "providerReloaded": "Validated and reloaded {{provider}}.",
+        "reloadProviderFailed": "Failed to validate and reload {{provider}}."
+      },
+      "errors": {
+        "httpEnvUnsupported": "Can't generate a proxy config for \"{{envName}}\" from this machine because the env only has an API connection.",
+        "sshEnvUnsupported": "Can't generate a proxy config for \"{{envName}}\" yet because SSH envs are not implemented.",
+        "invalidProxyPort": "Invalid proxy entry port \"{{port}}\". Use an integer between 1 and 65535.",
+        "missingAppPort": "Missing appPort for env \"{{envName}}\". Save or update the app port before generating proxy config.",
+        "missingVersion": "Couldn't determine the app version for env \"{{envName}}\". Run `nb env update {{envName}}` and try again.",
+        "appEntryMissingInclude": "The editable app entry config at {{appConfigPath}} does not reference {{generatedConfigPath}}. Add the managed generated-config reference back into the editable app entry and rerun the command.",
+        "nginxOutputUnsupported": "The nginx provider does not support `--output`. It writes `app.conf`, `public/index-v1.html`, `public/index-v2.html`, and `nocobase.conf` into `~/.nocobase/proxy/nginx/<env>/`.",
+        "caddyOutputUnsupported": "The caddy provider does not support `--output`. It writes `app.caddy`, `generated.caddy`, `public/index-v1.html`, `public/index-v2.html`, and `nocobase.caddy` into `~/.nocobase/proxy/caddy/<env>/`.",
+        "nginxAppEntryMissingManagedBlock": "The editable nginx app entry config at {{appConfigPath}} does not contain the NocoBase managed block. Restore the managed block or delete the file and rerun `nb env proxy`."
+      }
+    },
     "shared": {
-      "missingCommand": "Couldn't run `{{action}}` because the {{displayName}} executable could not be found. Install {{displayName}} or update `nb config set {{configKey}} <path>` and try again."
+      "missingCommand": "Couldn't run `{{action}}` because the {{displayName}} executable could not be found. Install {{displayName}} or update `nb config set {{configKey}} <path>` and try again.",
+      "dockerDaemonUnavailable": "Couldn't run `{{action}}` because Docker is installed but the Docker daemon is not running. Start Docker Desktop or the Docker daemon service, then try again. Details: {{details}}",
+      "targetEnv": "Using env \"{{envName}}\".",
+      "crossEnv": {
+        "prompt": "Current env is \"{{currentEnv}}\", but this command targets \"{{requestedEnv}}\" via --env. Continue without switching the current env?",
+        "refusal": "Refusing to run against env \"{{requestedEnv}}\" because the current env is \"{{currentEnv}}\" and interactive confirmation is unavailable in the current agent session.\n\nFor safety, the agent will not switch envs automatically and will not add --yes on your behalf.\n\nTo continue:\n- run `nb env use {{requestedEnv}}` yourself and then re-run the command, or\n- re-run the same command with `--env {{requestedEnv}} --yes` to confirm this one-off cross-env operation."
+      }
+    },
+    "license": {
+      "activate": {
+        "interactive": {
+          "notice": {
+            "hostnameLabel": "❯ Hostname",
+            "instanceIdLabel": "❯ Instance ID",
+            "copyHintWithHostname": "Copy this hostname and instance ID when checking or activating the license key.",
+            "copyHintWithoutHostname": "Copy this instance ID when checking or activating the license key."
+          },
+          "prompts": {
+            "provideMethod": {
+              "message": "How do you want to provide the license key?",
+              "keyOption": "Paste the license key",
+              "fileOption": "Read the key from a file"
+            },
+            "key": {
+              "message": "License key",
+              "transformer": "Entered {{count}} chars",
+              "required": "License key is required."
+            },
+            "keyFile": {
+              "message": "Path to the license key file",
+              "required": "License key file path is required."
+            }
+          }
+        },
+        "errors": {
+          "provideKeyOrKeyFile": "Provide --key or --key-file to continue.",
+          "emptyInput": "License key input was empty.",
+          "activationFailed": "Failed to activate the license for env \"{{envName}}\": {{reason}}.",
+          "reasons": {
+            "keyStatus": "license key is {{status}}",
+            "envMismatch": "license key does not match the current instance environment",
+            "domainMismatch": "license key does not match the current app domain",
+            "licenseStatus": "license status is {{status}}",
+            "validationFailed": "license validation failed"
+          }
+        },
+        "messages": {
+          "activated": "Activated the license for env \"{{envName}}\".",
+          "savedLicenseKey": "Saved license key at {{licenseKeyPath}}"
+        }
+      }
     },
     "download": {
       "failures": {
@@ -236,14 +322,18 @@
         "lang": {
           "message": "Which language would you like to use?"
         },
-        "appRootPath": {
-          "message": "Where should this app be stored?",
-          "placeholder": "./<env>/source/"
+        "appPath": {
+          "message": "Where should this app be stored? (relative to {{root}})",
+          "placeholder": "./<env>/"
         },
         "appPort": {
           "message": "Which port should this app use?",
           "placeholder": "13000"
         },
+        "appPublicPath": {
+          "message": "What is the app subpath? (for example, /nocobase/)",
+          "placeholder": "/ or /nocobase/"
+        },
         "storagePath": {
           "message": "Where should uploads and local files be stored?",
           "placeholder": "./<env>/storage/"
@@ -308,7 +398,7 @@
         "envExists": "Env \"{{envName}}\" already exists. Choose another env name."
       },
       "messages": {
-        "title": "Set Up NocoBase for Coding Agents",
+        "title": "Set up NocoBase for coding agents",
         "appNameRequiredWhenSkipped": "Env name is required when prompts are skipped.",
         "appNameEnvHelp": "Use `nb init --yes --env <envName>` to continue.",
         "resumeEnvRequired": "Env name is required when resuming setup.",
@@ -325,10 +415,14 @@
           "message": "What should this environment use for `--env`?",
           "placeholder": "local"
         },
-        "hasNocobase": {
-          "message": "Do you already have a NocoBase application?",
-          "noLabel": "I don't have a NocoBase application yet",
-          "yesLabel": "I already have a NocoBase application"
+        "setupMode": {
+          "message": "How would you like to set up this environment?",
+          "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",
+          "manageLocalHint": "Bring an app on this machine under nb management so install, upgrade, and startup can be handled in one place. During takeover, nb will re-download the app source or image and upgrade the app; storage will be created automatically when needed.",
+          "connectRemoteLabel": "Connect a remote app",
+          "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)?"
@@ -342,24 +436,24 @@
         }
       },
       "webUi": {
-        "pageTitle": "Set Up NocoBase for Coding Agents",
-        "documentHeading": "Set Up NocoBase for Coding Agents",
-        "documentHint": "Connect an existing NocoBase app, or install a new one, so coding agents can access and work with NocoBase.",
+        "pageTitle": "Set up NocoBase for coding agents",
+        "documentHeading": "Set up NocoBase for coding agents",
+        "documentHint": "Install a new app, manage one that already exists on this machine, or connect a remote app so coding agents can access and work with NocoBase.",
         "gettingStarted": {
           "title": "Getting started",
-          "description": "Choose whether to connect an existing app or install a new one."
+          "description": "Choose whether to install a new app, manage a local app, or connect a remote app."
         },
         "connectExistingApp": {
-          "title": "Connect an existing app",
-          "description": "Save your app connection."
+          "title": "Connection & authentication",
+          "description": "Enter the app access URL and choose an authentication method."
         },
         "createNewApp": {
-          "title": "Install a new app",
-          "description": "Set app basics and install options."
+          "title": "App environment",
+          "description": "Set the app basics, storage location, and runtime port."
         },
         "downloadAppFiles": {
-          "title": "Download app files",
-          "description": "Choose how to get the app files."
+          "title": "App source and version",
+          "description": "Choose how to get the app and which source and version to use."
         },
         "configureDatabase": {
           "title": "Configure the database",
@@ -370,6 +464,12 @@
           "description": "Set up the first admin."
         }
       }
+    },
+    "env": {
+      "messages": {
+        "noEnvsConfigured": "No envs configured.",
+        "noEnvsConfiguredHelp": "Run `nb init --ui` to create one first."
+      }
     }
   },
   "apiCommandCompat": {

package/dist/locale/zh-CN.json

@@ -63,6 +63,9 @@
     "envKey": {
       "invalid": "仅支持字母和数字。"
     },
+    "appPublicPath": {
+      "invalid": "请输入 /，或类似 /nocobase/、/foo-bar/baz_2/ 这样的路径。每个路径段仅支持字母、数字、中划线和下划线。"
+    },
     "tcpPort": {
       "invalid": "请输入 1 到 65535 之间的有效 TCP 端口，例如 {{example}}。",
       "allocateFailed": "分配可用 TCP 端口失败。",
@@ -96,10 +99,10 @@
           "placeholder": "https://demo.example.com/api 或 https://demo.example.com/api/__app/<subapp>"
         },
         "authType": {
-          "message": "你想使用哪种登录方式？",
-          "basicLabel": "Basic 登录（用户名 + 密码）",
+          "message": "你想使用哪种认证方式？",
+          "basicLabel": "Basic 认证（用户名 + 密码）",
           "basicHint": "保存后会用用户名和密码换取 Token",
-          "oauthLabel": "OAuth（浏览器登录）",
+          "oauthLabel": "OAuth（浏览器认证）",
           "oauthHint": "保存后会自动执行 nb env auth",
           "tokenLabel": "API Token / API Key"
         },
@@ -116,8 +119,91 @@
         }
       }
     },
+    "envProxy": {
+      "messages": {
+        "generating": "正在为 env \"{{envName}}\" 生成代理配置...",
+        "printed": "已输出 env \"{{envName}}\" 的代理配置。",
+        "saved": "已将 env \"{{envName}}\" 的生成代理配置保存到 {{outputPath}}。",
+        "savedWithAppEntryCreated": "已将 env \"{{envName}}\" 的生成代理配置保存到 {{outputPath}}，并创建可编辑的入口配置 {{appConfigPath}}。",
+        "savedWithAppEntryMigrated": "已将 env \"{{envName}}\" 的生成代理配置保存到 {{outputPath}}，并将入口配置迁移为 {{appConfigPath}}。",
+        "savedNginxBundleCreated": "已将 env \"{{envName}}\" 的 nginx 代理文件保存到 {{entryDir}}，并创建可编辑的入口配置 {{appConfigPath}}。",
+        "savedNginxBundleUpdated": "已将 env \"{{envName}}\" 的 nginx 代理文件保存到 {{entryDir}}，并刷新可编辑的入口配置 {{appConfigPath}}。",
+        "savedCaddyBundleCreated": "已将 env \"{{envName}}\" 的 caddy 代理文件保存到 {{entryDir}}，并创建可编辑的入口配置 {{appConfigPath}}。",
+        "savedCaddyBundleMigrated": "已将 env \"{{envName}}\" 的 caddy 代理文件保存到 {{entryDir}}，并将入口配置迁移为 {{appConfigPath}}。",
+        "savedCaddyBundleUpdated": "已将 env \"{{envName}}\" 的 caddy 代理文件保存到 {{entryDir}}，并刷新可编辑的入口配置 {{appConfigPath}}。",
+        "failed": "为 env \"{{envName}}\" 生成代理配置失败。",
+        "installingProvider": "正在将共享代理配置安装到 {{provider}}...",
+        "providerInstalled": "已将共享代理配置安装到 {{provider}} 主配置 {{configPath}}。",
+        "providerAlreadyInstalled": "共享代理配置已存在于 {{provider}} 主配置 {{configPath}} 中。",
+        "installProviderFailed": "将共享代理配置安装到 {{provider}} 失败。",
+        "reloadingProvider": "正在校验并重载 {{provider}}...",
+        "providerReloaded": "已校验并重载 {{provider}}。",
+        "reloadProviderFailed": "校验并重载 {{provider}} 失败。"
+      },
+      "errors": {
+        "httpEnvUnsupported": "无法在当前机器上为 \"{{envName}}\" 生成代理配置，因为这个 env 只有 API 连接。",
+        "sshEnvUnsupported": "暂时无法为 \"{{envName}}\" 生成代理配置，因为 SSH env 还没有实现。",
+        "invalidProxyPort": "代理入口端口 \"{{port}}\" 无效。请使用 1 到 65535 之间的整数。",
+        "missingAppPort": "env \"{{envName}}\" 缺少 appPort。请先保存或更新应用端口后再生成代理配置。",
+        "missingVersion": "无法确定 env \"{{envName}}\" 的应用版本。请先运行 `nb env update {{envName}}`，然后再试一次。",
+        "appEntryMissingInclude": "可编辑入口配置 {{appConfigPath}} 没有引用 {{generatedConfigPath}}。请把托管的 generated 配置引用补回入口配置中，然后重新执行该命令。",
+        "nginxOutputUnsupported": "nginx provider 不支持 `--output`。它会把 `app.conf`、`public/index-v1.html`、`public/index-v2.html` 和 `nocobase.conf` 写入 `~/.nocobase/proxy/nginx/<env>/`。",
+        "caddyOutputUnsupported": "caddy provider 不支持 `--output`。它会把 `app.caddy`、`generated.caddy`、`public/index-v1.html`、`public/index-v2.html` 和 `nocobase.caddy` 写入 `~/.nocobase/proxy/caddy/<env>/`。",
+        "nginxAppEntryMissingManagedBlock": "可编辑的 nginx 入口配置 {{appConfigPath}} 不包含 NocoBase 的托管区块。请恢复这个托管区块，或删除该文件后重新执行 `nb env proxy`。"
+      }
+    },
     "shared": {
-      "missingCommand": "无法执行 `{{action}}`，因为找不到 {{displayName}} 可执行文件。请先安装 {{displayName}}，或更新 `nb config set {{configKey}} <path>` 后重试。"
+      "missingCommand": "无法执行 `{{action}}`，因为找不到 {{displayName}} 可执行文件。请先安装 {{displayName}}，或更新 `nb config set {{configKey}} <path>` 后重试。",
+      "dockerDaemonUnavailable": "无法执行 `{{action}}`，因为 Docker 已安装，但 Docker daemon 尚未运行。请先启动 Docker Desktop 或 Docker daemon 服务，然后重试。详情：{{details}}",
+      "targetEnv": "正在使用 env \"{{envName}}\"。",
+      "crossEnv": {
+        "prompt": "当前 env 是 \"{{currentEnv}}\"，但该命令通过 --env 指向了 \"{{requestedEnv}}\"。要在不切换当前 env 的情况下继续吗？",
+        "refusal": "拒绝对 env \"{{requestedEnv}}\" 执行该命令，因为当前 env 是 \"{{currentEnv}}\"，且当前 agent 会话无法进行交互确认。\n\n出于安全考虑，agent 不会自动切换 env，也不会替你自动补上 --yes。\n\n如果要继续：\n- 请先自行执行 `nb env use {{requestedEnv}}`，然后重新运行该命令，或\n- 使用相同命令并追加 `--env {{requestedEnv}} --yes`，以确认这是一次性的跨 env 操作。"
+      }
+    },
+    "license": {
+      "activate": {
+        "interactive": {
+          "notice": {
+            "hostnameLabel": "❯ 主机名",
+            "instanceIdLabel": "❯ 实例 ID",
+            "copyHintWithHostname": "校验或激活 license key 时，请复制这个主机名和实例 ID。",
+            "copyHintWithoutHostname": "校验或激活 license key 时，请复制这个实例 ID。"
+          },
+          "prompts": {
+            "provideMethod": {
+              "message": "你想通过哪种方式提供 license key？",
+              "keyOption": "直接粘贴 license key",
+              "fileOption": "从文件读取 key"
+            },
+            "key": {
+              "message": "License Key",
+              "transformer": "已输入 {{count}} 个字符",
+              "required": "必须提供 license key。"
+            },
+            "keyFile": {
+              "message": "license key 文件路径",
+              "required": "必须提供 license key 文件路径。"
+            }
+          }
+        },
+        "errors": {
+          "provideKeyOrKeyFile": "请通过 --key 或 --key-file 继续。",
+          "emptyInput": "license key 输入为空。",
+          "activationFailed": "为 env \"{{envName}}\" 激活 license 失败：{{reason}}。",
+          "reasons": {
+            "keyStatus": "license key 状态为 {{status}}",
+            "envMismatch": "license key 与当前实例环境不匹配",
+            "domainMismatch": "license key 与当前应用域名不匹配",
+            "licenseStatus": "license 状态为 {{status}}",
+            "validationFailed": "license 校验失败"
+          }
+        },
+        "messages": {
+          "activated": "已为 env \"{{envName}}\" 激活 license。",
+          "savedLicenseKey": "license key 已保存到 {{licenseKeyPath}}"
+        }
+      }
     },
     "download": {
       "failures": {
@@ -236,14 +322,18 @@
         "lang": {
           "message": "你想使用哪种语言？"
         },
-        "appRootPath": {
-          "message": "应用代码要放到哪里？",
-          "placeholder": "./<env>/source/"
+        "appPath": {
+          "message": "应用要放到哪里？（相对路径基于 {{root}}）",
+          "placeholder": "./<env>/"
         },
         "appPort": {
           "message": "应用要使用哪个端口？",
           "placeholder": "13000"
         },
+        "appPublicPath": {
+          "message": "应用的子路径是什么？（例如 /nocobase/）",
+          "placeholder": "/ 或 /nocobase/"
+        },
         "storagePath": {
           "message": "上传文件和本地存储目录要放到哪里？",
           "placeholder": "./<env>/storage/"
@@ -325,10 +415,14 @@
           "message": "这个环境要使用什么 `--env` 标识？",
           "placeholder": "local"
         },
-        "hasNocobase": {
-          "message": "你是否已经有一个 NocoBase 应用？",
-          "noLabel": "还没有 NocoBase 应用",
-          "yesLabel": "已经有 NocoBase 应用"
+        "setupMode": {
+          "message": "你想用哪种方式配置这个环境？",
+          "installNewLabel": "新安装",
+          "installNewHint": "从零安装一个新的应用，适合首次部署、试用或新建本地开发环境。",
+          "manageLocalLabel": "本机接管",
+          "manageLocalHint": "将本机已有应用纳入 nb 管理，后续可统一执行安装、升级和启动等操作。接管过程中会重新下载应用代码或镜像并升级应用，storage 会在需要时自动创建。",
+          "connectRemoteLabel": "远程连接",
+          "connectRemoteHint": "只保存远程应用的连接信息，不在本机安装或接管应用。"
         },
         "installSkills": {
           "message": "是否安装 NocoBase AI coding skills（nocobase/skills）？"
@@ -344,22 +438,22 @@
       "webUi": {
         "pageTitle": "配置供 Coding Agents 使用的 NocoBase",
         "documentHeading": "配置供 Coding Agents 使用的 NocoBase",
-        "documentHint": "连接已有的 NocoBase 应用，或安装一个新的应用，让 Coding Agents 可以在当前工作区中访问和操作 NocoBase。",
+        "documentHint": "安装一个新的应用、接管本机已有应用，或连接远程应用，让 Coding Agents 可以在当前工作区中访问和操作 NocoBase。",
         "gettingStarted": {
           "title": "开始设置",
-          "description": "选择连接已有应用，或安装一个新应用。"
+          "description": "选择新安装、本机接管，或远程连接。"
         },
         "connectExistingApp": {
-          "title": "连接已有应用",
-          "description": "保存现有应用连接。"
+          "title": "连接与认证",
+          "description": "填写应用访问地址并选择认证方式。"
         },
         "createNewApp": {
-          "title": "安装新应用",
-          "description": "设置应用基础信息和安装选项。"
+          "title": "应用环境信息",
+          "description": "设置应用的基础信息、存储位置和运行端口。"
         },
         "downloadAppFiles": {
-          "title": "下载应用文件",
-          "description": "选择获取应用文件的方式。"
+          "title": "应用来源和版本",
+          "description": "选择应用的获取方式，以及要使用的来源和版本。"
         },
         "configureDatabase": {
           "title": "配置数据库",
@@ -370,6 +464,12 @@
           "description": "设置第一个管理员账号。"
         }
       }
+    },
+    "env": {
+      "messages": {
+        "noEnvsConfigured": "尚未配置任何 env。",
+        "noEnvsConfiguredHelp": "请先运行 `nb init --ui` 创建一个。"
+      }
     }
   },
   "apiCommandCompat": {