@nocobase/cli 2.2.0-beta.1 → 2.2.0-beta.10

package/dist/lib/source-publish.js

@@ -232,7 +232,7 @@ export async function publishSourceSnapshot(params) {
             version,
             stdio,
         });
-        await run('yarn', ['lerna', 'publish', 'from-package', '--registry', npmRegistry, '--dist-tag', 'local', '--yes', '--no-verify-access', '--git-head', gitSha], {
+        await run('yarn', ['lerna', 'publish', 'from-package', '--registry', npmRegistry, '--dist-tag', 'local', '--yes', '--no-verify-access', '--no-git-reset', '--git-head', gitSha], {
             cwd: projectRoot,
             errorName: 'lerna publish',
             stdio,
@@ -319,7 +319,7 @@ export function buildSuggestedInitCommand(result) {
     const normalizedRegistry = result.npmRegistry || `http://${host}:${port || DEFAULT_SOURCE_REGISTRY_PORT}`;
     const suggestedEnv = ['snapshot', sanitizeEnvSegment(result.gitSha)].filter(Boolean).join('');
     return [
-        `nb init --ui --env ${suggestedEnv} --yes --source npm`,
+        `nb init --env ${suggestedEnv} --yes --source npm`,
         `--version ${result.version}`,
         `--npm-registry=${normalizedRegistry}`,
     ].join(' ');

package/dist/lib/startup-update.js

@@ -151,7 +151,7 @@ export async function shouldRunStartupUpdateCheck(argv, now = new Date()) {
     return readCurrentInstallLastCheckedDate(state) !== todayStamp(now);
 }
 export function shouldEnableStartupUpdateForInstallMethod(installMethod) {
-    return installMethod === 'npm-global';
+    return installMethod === 'npm-global' || installMethod === 'pnpm-global' || installMethod === 'yarn-global';
 }
 function hasPendingUpdates(selfStatus, skillsStatus) {
     return Boolean(selfStatus.updateAvailable || skillsStatus.updateAvailable === true);

package/dist/locale/en-US.json

@@ -1,4 +1,10 @@
 {
+  "entry": {
+    "windowsAdministratorRequired": {
+      "message": "NocoBase CLI must be run as Administrator on Windows.",
+      "hint": "Open your terminal as Administrator, then run the command again."
+    }
+  },
   "promptCatalog": {
     "common": {
       "cancelled": "Cancelled.",
@@ -62,7 +68,7 @@
       "unreachable": "Unable to connect to the API base URL. Check the address and make sure the server is reachable. Details: {{details}}"
     },
     "envKey": {
-      "invalid": "Use letters and numbers only."
+      "invalid": "Use letters, numbers, hyphens, and underscores 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."
@@ -87,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)",
@@ -108,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"
         }
       }
@@ -173,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"
             },
@@ -246,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",
@@ -255,9 +261,9 @@
           "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. Currently unavailable.",
+          "latestHint": "Stable release. Best for production use and the most predictable experience.",
           "betaLabel": "beta",
           "betaHint": "Preview release. Good for trying upcoming features before general release.",
           "alphaLabel": "alpha",
@@ -266,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"
         },
@@ -317,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"
         }
       }
@@ -399,7 +405,7 @@
         "envExists": "Env \"{{envName}}\" already exists. Choose another env name."
       },
       "messages": {
-        "title": "Set up NocoBase for coding agents",
+        "title": "Set up NocoBase",
         "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.",
@@ -413,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",
@@ -426,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",
@@ -437,9 +443,9 @@
         }
       },
       "webUi": {
-        "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.",
+        "pageTitle": "Set up NocoBase",
+        "documentHeading": "Set up NocoBase",
+        "documentHint": "Install a new app, manage an existing one, or connect a remote app. You can use it directly or let a coding agent access it later.",
         "gettingStarted": {
           "title": "Getting started",
           "description": "Choose whether to install a new app, manage a local app, or connect a remote app."

package/dist/locale/zh-CN.json

@@ -1,4 +1,10 @@
 {
+  "entry": {
+    "windowsAdministratorRequired": {
+      "message": "Windows 上运行 NocoBase CLI 必须使用管理员模式。",
+      "hint": "请以管理员身份打开终端，然后重新执行命令。"
+    }
+  },
   "promptCatalog": {
     "common": {
       "cancelled": "已取消。",
@@ -62,7 +68,7 @@
       "unreachable": "无法连接到该 API 地址，请检查地址是否正确，并确认服务可访问。详情：{{details}}"
     },
     "envKey": {
-      "invalid": "仅支持字母和数字。"
+      "invalid": "仅支持字母、数字、中划线和下划线。"
     },
     "appPublicPath": {
       "invalid": "请输入 /，或类似 /nocobase/、/foo-bar/baz_2/ 这样的路径。每个路径段仅支持字母、数字、中划线和下划线。"
@@ -87,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（浏览器认证）",
@@ -108,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"
         }
       }
@@ -173,7 +179,7 @@
           },
           "prompts": {
             "provideMethod": {
-              "message": "你想通过哪种方式提供 license key？",
+              "message": "License key 提供方式",
               "keyOption": "直接粘贴 license key",
               "fileOption": "从文件读取 key"
             },
@@ -246,7 +252,7 @@
       },
       "prompts": {
         "source": {
-          "message": "你想通过哪种方式获取 NocoBase？",
+          "message": "NocoBase 获取方式",
           "dockerLabel": "Docker 安装（推荐）",
           "dockerHint": "适合无代码或低维护成本场景。后续升级时，拉取新镜像并重启应用即可。",
           "npmLabel": "create-nocobase-app 安装",
@@ -255,9 +261,9 @@
           "gitHint": "适合体验最新未发布版本、参与贡献，或直接修改和调试 NocoBase 源码。这个方式更偏向开发者使用。"
         },
         "version": {
-          "message": "你想使用哪个版本？",
+          "message": "NocoBase 版本",
           "latestLabel": "latest",
-          "latestHint": "稳定版。适合生产环境和希望获得稳定体验的场景。当前暂不可用。",
+          "latestHint": "稳定版。适合生产环境和希望获得稳定体验的场景。",
           "betaLabel": "beta",
           "betaHint": "测试版。包含即将发布的新功能，适合提前体验和反馈。",
           "alphaLabel": "alpha",
@@ -266,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 根据当前机器自动选择"
         },
@@ -317,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"
         }
       }
@@ -399,7 +405,7 @@
         "envExists": "Env \"{{envName}}\" 已存在，请换一个 env name。"
       },
       "messages": {
-        "title": "配置供 Coding Agents 使用的 NocoBase",
+        "title": "配置 NocoBase",
         "appNameRequiredWhenSkipped": "跳过 prompts 时必须提供 Env name。",
         "appNameEnvHelp": "请使用 `nb init --yes --env <envName>` 继续。",
         "resumeEnvRequired": "恢复安装时必须提供 Env name。",
@@ -413,11 +419,11 @@
       },
       "prompts": {
         "appName": {
-          "message": "这个环境要使用什么 `--env` 标识？",
+          "message": "应用环境唯一标识（CLI 将通过该标识定位并操作对应环境）",
           "placeholder": "local"
         },
         "setupMode": {
-          "message": "你想用哪种方式配置这个环境？",
+          "message": "应用环境配置方式",
           "installNewLabel": "新安装",
           "installNewHint": "从零安装一个新的应用，适合首次部署、试用或新建本地开发环境。",
           "manageLocalLabel": "本机接管",
@@ -426,7 +432,7 @@
           "connectRemoteHint": "只保存远程应用的连接信息，不在本机安装或接管应用。"
         },
         "installSkills": {
-          "message": "是否安装 NocoBase AI coding skills（nocobase/skills）？"
+          "message": "安装 NocoBase AI coding skills（nocobase/skills）"
         },
         "apiBaseUrl": {
           "message": "API 基础地址",
@@ -437,9 +443,9 @@
         }
       },
       "webUi": {
-        "pageTitle": "配置供 Coding Agents 使用的 NocoBase",
-        "documentHeading": "配置供 Coding Agents 使用的 NocoBase",
-        "documentHint": "安装一个新的应用、接管本机已有应用，或连接远程应用，让 Coding Agents 可以在当前工作区中访问和操作 NocoBase。",
+        "pageTitle": "配置 NocoBase",
+        "documentHeading": "配置 NocoBase",
+        "documentHint": "安装一个新的应用、管理已有应用，或连接远程应用。你可以直接使用它，也可以稍后让 coding agent 访问它。",
         "gettingStarted": {
           "title": "开始设置",
           "description": "选择新安装、本机接管，或远程连接。"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.2.0-beta.1",
+  "version": "2.2.0-beta.10",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -12,6 +12,12 @@
   "keywords": [],
   "author": "",
   "license": "Apache-2.0",
+  "files": [
+    "assets",
+    "bin",
+    "dist",
+    "nocobase-ctl.config.json"
+  ],
   "bin": {
     "nb": "./bin/run.js"
   },
@@ -138,5 +144,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "f82fa9d0c3aa8e00e53dd94e404a312483b4866b"
+  "gitHead": "d572beec24de46df948f28db72b25303a63bf62d"
 }

package/scripts/build.mjs

@@ -1,34 +0,0 @@
-import { copyFileSync, mkdirSync, readdirSync, rmSync } from 'node:fs';
-import { createRequire } from 'node:module';
-import path from 'node:path';
-import { spawnSync } from 'node:child_process';
-import { fileURLToPath } from 'node:url';
-
-const require = createRequire(import.meta.url);
-const scriptsDir = path.dirname(fileURLToPath(import.meta.url));
-const packageRoot = path.resolve(scriptsDir, '..');
-const distDir = path.join(packageRoot, 'dist');
-const srcLocaleDir = path.join(packageRoot, 'src', 'locale');
-const distLocaleDir = path.join(distDir, 'locale');
-const tscBin = require.resolve('typescript/bin/tsc');
-
-rmSync(distDir, { recursive: true, force: true });
-
-const compile = spawnSync(process.execPath, [tscBin, '-p', path.join(packageRoot, 'tsconfig.json')], {
-  cwd: packageRoot,
-  stdio: 'inherit',
-});
-
-if (compile.status !== 0) {
-  process.exit(compile.status ?? 1);
-}
-
-mkdirSync(distLocaleDir, { recursive: true });
-
-for (const entry of readdirSync(srcLocaleDir, { withFileTypes: true })) {
-  if (!entry.isFile() || !entry.name.endsWith('.json')) {
-    continue;
-  }
-
-  copyFileSync(path.join(srcLocaleDir, entry.name), path.join(distLocaleDir, entry.name));
-}

package/scripts/clean.mjs

@@ -1,9 +0,0 @@
-import { rmSync } from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const scriptsDir = path.dirname(fileURLToPath(import.meta.url));
-const packageRoot = path.resolve(scriptsDir, '..');
-const distDir = path.join(packageRoot, 'dist');
-
-rmSync(distDir, { recursive: true, force: true });

package/tsconfig.json

@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
-    "rewriteRelativeImportExtensions": true,
-    "rootDir": "src",
-    "outDir": "dist",
-    "declaration": false,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "types": ["node"],
-    "skipLibCheck": true,
-    "strict": false
-  },
-  "include": ["src/**/*.ts"],
-  "exclude": ["src/**/__tests__/**"]
-}