@nocobase/cli 2.1.0-beta.36 → 2.1.0-beta.37

package/dist/lib/skills-manager.js

@@ -17,6 +17,72 @@ import { commandOutput, commandOutputViaFile, run } from './run-npm.js';
 export const NOCOBASE_SKILLS_SOURCE = 'nocobase/skills';
 export const NOCOBASE_SKILLS_PACKAGE_NAME = '@nocobase/skills';
 const NOCOBASE_SKILLS_NAME_PREFIX = 'nocobase-';
+const SKILLS_LIST_TIMEOUT_MS = 5000;
+const SKILLS_NPM_VIEW_TIMEOUT_MS = 3000;
+const SKILLS_PACK_TIMEOUT_MS = 30000;
+const SKILLS_ADD_TIMEOUT_MS = 20000;
+const NPM_REGISTRY_UNAVAILABLE_PATTERNS = [
+    'enotfound',
+    'eai_again',
+    'etimedout',
+    'esockettimedout',
+    'econnreset',
+    'econnrefused',
+    'ehostunreach',
+    'enetunreach',
+    'socket hang up',
+    'getaddrinfo',
+    'fetch failed',
+    'network request to',
+    'self_signed_cert',
+    'depth_zero_self_signed_cert',
+    'unable_to_verify_leaf_signature',
+    'cert_has_expired',
+    'timed out after',
+];
+function collectErrorMessages(error) {
+    const messages = [];
+    const queue = [error];
+    const seen = new Set();
+    while (queue.length > 0) {
+        const current = queue.shift();
+        if (current === undefined || current === null || seen.has(current)) {
+            continue;
+        }
+        seen.add(current);
+        if (current instanceof Error) {
+            if (current.message) {
+                messages.push(current.message);
+            }
+            const cause = current.cause;
+            if (cause !== undefined) {
+                queue.push(cause);
+            }
+            continue;
+        }
+        if (typeof current === 'string') {
+            messages.push(current);
+            continue;
+        }
+        if (typeof current === 'object') {
+            if ('message' in current && typeof current.message === 'string') {
+                messages.push(current.message);
+            }
+            if ('cause' in current) {
+                queue.push(current.cause);
+            }
+            continue;
+        }
+        messages.push(String(current));
+    }
+    return messages;
+}
+export function isNpmRegistryUnavailable(error) {
+    return collectErrorMessages(error).some((message) => {
+        const normalized = message.toLowerCase();
+        return NPM_REGISTRY_UNAVAILABLE_PATTERNS.some((pattern) => normalized.includes(pattern));
+    });
+}
 function normalizePath(value) {
     return path.resolve(value);
 }
@@ -72,6 +138,7 @@ export async function listGlobalSkills(options = {}) {
     const output = await (options.commandOutputFn ?? commandOutputViaFile)('npx', ['-y', 'skills', 'list', '-g', '--json'], {
         cwd: globalRoot,
         errorName: 'skills list',
+        timeoutMs: SKILLS_LIST_TIMEOUT_MS,
     });
     const parsed = JSON.parse(output);
     return Array.isArray(parsed) ? parsed : [];
@@ -95,6 +162,7 @@ async function readPublishedSkillsVersion(options = {}) {
         const output = await (options.commandOutputFn ?? commandOutput)('npm', ['view', NOCOBASE_SKILLS_PACKAGE_NAME, 'version', '--json'], {
             cwd: globalRoot,
             errorName: 'npm view',
+            timeoutMs: SKILLS_NPM_VIEW_TIMEOUT_MS,
         });
         const parsed = JSON.parse(output);
         const version = String(parsed ?? '').trim();
@@ -187,6 +255,7 @@ async function prepareLocalSkillsPackage(globalRoot, options = {}, targetVersion
             cwd: packRoot,
             stdio: options.verbose ? 'inherit' : 'ignore',
             errorName: 'npm pack',
+            timeoutMs: SKILLS_PACK_TIMEOUT_MS,
         });
         const tarballPath = await resolvePackedSkillsTarball(packRoot);
         await extractPackedSkillsTarball(tarballPath, cacheRoot, targetVersion);
@@ -276,6 +345,7 @@ async function reinstallManagedSkills(globalRoot, options = {}, targetVersion) {
             cwd: globalRoot,
             stdio: options.verbose ? 'inherit' : 'ignore',
             errorName: 'skills add',
+            timeoutMs: SKILLS_ADD_TIMEOUT_MS,
         });
     }
     finally {
@@ -314,10 +384,10 @@ export async function updateNocoBaseSkills(options = {}) {
             status,
         };
     }
-    if (status.managedByNb
-        && status.latestVersion
-        && status.installedVersion
-        && compareVersions(status.latestVersion, status.installedVersion) <= 0) {
+    if (status.managedByNb &&
+        status.latestVersion &&
+        status.installedVersion &&
+        compareVersions(status.latestVersion, status.installedVersion) <= 0) {
         return {
             action: 'noop',
             reason: 'up-to-date',

package/dist/locale/en-US.json

@@ -34,6 +34,8 @@
       "back": "Back",
       "next": "Next",
       "submit": "Submit & continue in terminal",
+      "showPassword": "Show password",
+      "hidePassword": "Hide password",
       "checking": "Checking...",
       "sending": "Sending...",
       "successTitle": "Success",
@@ -73,7 +75,8 @@
       "timeout": "Timed out connecting to the database at {{host}}:{{port}} after about {{seconds}} seconds.",
       "authenticationFailed": "Failed to sign in to database \"{{database}}\" with user \"{{user}}\". Check the username and password.",
       "databaseNotFound": "Database \"{{database}}\" does not exist or is not accessible with the current connection settings.",
-      "connectionFailed": "Database connection check failed. Details: {{details}}"
+      "connectionFailed": "Database connection check failed. Details: {{details}}",
+      "lowerCaseTableNamesRequiresUnderscored": "MySQL lower_case_table_names=1 requires DB_UNDERSCORED=true."
     }
   },
   "commands": {
@@ -94,16 +97,28 @@
         },
         "authType": {
           "message": "How would you like to sign in?",
+          "basicLabel": "Basic login (username + password)",
+          "basicHint": "uses your credentials to fetch a token after save",
           "oauthLabel": "OAuth (browser login)",
           "oauthHint": "runs nb env auth after save",
           "tokenLabel": "API token / API key"
         },
+        "username": {
+          "message": "Enter the username for basic login",
+          "placeholder": "admin"
+        },
+        "password": {
+          "message": "Enter the password for basic login"
+        },
         "accessToken": {
           "message": "Enter an API token or API key",
           "placeholder": "Enter your API token / API key"
         }
       }
     },
+    "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."
+    },
     "download": {
       "failures": {
         "dependencyInstall": {
@@ -206,6 +221,10 @@
       }
     },
     "install": {
+      "messages": {
+        "skipDownloadDockerImageMissing": "Cannot continue with `--skip-download` because Docker image \"{{imageRef}}\" is not available locally. Load or pull the image first, or run the command again without `--skip-download`.",
+        "skipDownloadLocalAppMissing": "Cannot continue with `--skip-download` because \"{{projectRoot}}\" is missing or does not contain a package.json file. Point `--app-root-path` to an existing NocoBase app, or run the command again without `--skip-download`."
+      },
       "validation": {
         "builtinDbUnsupported": "Built-in database does not support \"{{dialect}}\" yet. Choose PostgreSQL, MySQL, or MariaDB, or turn off built-in database."
       },
@@ -229,9 +248,6 @@
           "message": "Where should uploads and local files be stored?",
           "placeholder": "./<env>/storage/"
         },
-        "fetchSource": {
-          "message": "Download NocoBase automatically if the app directory is empty?"
-        },
         "dbDialect": {
           "message": "Which database would you like to use?"
         },
@@ -259,6 +275,17 @@
         "dbPassword": {
           "message": "What is the database password?"
         },
+        "dbSchema": {
+          "message": "What is the database schema? (PostgreSQL only, optional)",
+          "placeholder": "Leave empty to use the default schema"
+        },
+        "dbTablePrefix": {
+          "message": "What table prefix should be used? (optional)",
+          "placeholder": "For example: nb_"
+        },
+        "dbUnderscored": {
+          "message": "Use underscored names for database tables and columns?"
+        },
         "rootUsername": {
           "message": "Choose the initial admin username",
           "placeholder": "nocobase"
@@ -290,7 +317,8 @@
         "uiOpening": "A local setup form will open in your browser. That form needs a person to fill it in. If you are using an AI agent, do not stop this process while the CLI waits for the submission.",
         "uiReady": "Local setup form is ready.",
         "uiReadyHelp": "If your browser does not open automatically, copy the URL below into your browser to continue. Keep this terminal session running while the CLI waits for the submission.",
-        "uiOpenBrowserFallback": "We could not open your browser automatically. Copy the URL above into your browser to continue setup, and keep this terminal session running. If you are using an AI agent, do not stop the current process."
+        "uiOpenBrowserFallback": "We could not open your browser automatically. Copy the URL above into your browser to continue setup, and keep this terminal session running. If you are using an AI agent, do not stop the current process.",
+        "skillsSyncRegistryUnavailable": "Couldn't reach the npm registry to sync NocoBase AI coding skills. Skipping skills install and continuing init. Run `nb skills install` later when registry access is available."
       },
       "prompts": {
         "appName": {
@@ -308,6 +336,9 @@
         "apiBaseUrl": {
           "message": "API base URL",
           "placeholder": "https://demo.example.com/api or https://demo.example.com/api/__app/<subapp>"
+        },
+        "skipDownload": {
+          "message": "Skip downloading NocoBase and reuse existing local app files or Docker images?"
         }
       },
       "webUi": {

package/dist/locale/zh-CN.json

@@ -34,6 +34,8 @@
       "back": "上一步",
       "next": "下一步",
       "submit": "提交并回到终端继续",
+      "showPassword": "显示密码",
+      "hidePassword": "隐藏密码",
       "checking": "检查中...",
       "sending": "提交中...",
       "successTitle": "成功",
@@ -73,7 +75,8 @@
       "timeout": "连接数据库 {{host}}:{{port}} 超时，约 {{seconds}} 秒内未成功建立连接。",
       "authenticationFailed": "无法使用用户 \"{{user}}\" 登录数据库 \"{{database}}\"。请检查用户名和密码。",
       "databaseNotFound": "数据库 \"{{database}}\" 不存在，或当前连接配置无权访问该数据库。",
-      "connectionFailed": "数据库连接检查失败。详情：{{details}}"
+      "connectionFailed": "数据库连接检查失败。详情：{{details}}",
+      "lowerCaseTableNamesRequiresUnderscored": "当 MySQL 的 lower_case_table_names=1 时，必须设置 DB_UNDERSCORED=true。"
     }
   },
   "commands": {
@@ -94,16 +97,28 @@
         },
         "authType": {
           "message": "你想使用哪种登录方式？",
+          "basicLabel": "Basic 登录（用户名 + 密码）",
+          "basicHint": "保存后会用用户名和密码换取 Token",
           "oauthLabel": "OAuth（浏览器登录）",
           "oauthHint": "保存后会自动执行 nb env auth",
           "tokenLabel": "API Token / API Key"
         },
+        "username": {
+          "message": "请输入 Basic 登录用户名",
+          "placeholder": "admin"
+        },
+        "password": {
+          "message": "请输入 Basic 登录密码"
+        },
         "accessToken": {
           "message": "请输入 API Token 或 API Key",
           "placeholder": "请输入你的 API Token / API Key"
         }
       }
     },
+    "shared": {
+      "missingCommand": "无法执行 `{{action}}`，因为找不到 {{displayName}} 可执行文件。请先安装 {{displayName}}，或更新 `nb config set {{configKey}} <path>` 后重试。"
+    },
     "download": {
       "failures": {
         "dependencyInstall": {
@@ -206,6 +221,10 @@
       }
     },
     "install": {
+      "messages": {
+        "skipDownloadDockerImageMissing": "无法继续执行 `--skip-download`，因为本地不存在 Docker 镜像 \"{{imageRef}}\"。请先手动加载或拉取这个镜像，或者去掉 `--skip-download` 后重试。",
+        "skipDownloadLocalAppMissing": "无法继续执行 `--skip-download`，因为 \"{{projectRoot}}\" 不存在，或者其中缺少 package.json。请把 `--app-root-path` 指向一个现有的 NocoBase 应用目录，或者去掉 `--skip-download` 后重试。"
+      },
       "validation": {
         "builtinDbUnsupported": "内置数据库暂不支持 \"{{dialect}}\"。请选择 PostgreSQL、MySQL 或 MariaDB，或者关闭内置数据库。"
       },
@@ -229,9 +248,6 @@
           "message": "上传文件和本地存储目录要放到哪里？",
           "placeholder": "./<env>/storage/"
         },
-        "fetchSource": {
-          "message": "如果应用目录为空，是否自动下载 NocoBase？"
-        },
         "dbDialect": {
           "message": "你想使用哪种数据库？"
         },
@@ -259,6 +275,17 @@
         "dbPassword": {
           "message": "数据库密码是什么？"
         },
+        "dbSchema": {
+          "message": "数据库 schema 是什么？（仅 PostgreSQL，可选）",
+          "placeholder": "留空则使用默认 schema"
+        },
+        "dbTablePrefix": {
+          "message": "要使用什么数据表前缀？（可选）",
+          "placeholder": "例如：nb_"
+        },
+        "dbUnderscored": {
+          "message": "数据库表名和字段名是否使用下划线风格？"
+        },
         "rootUsername": {
           "message": "设置初始管理员用户名",
           "placeholder": "nocobase"
@@ -290,7 +317,8 @@
         "uiOpening": "本地 setup 表单即将在浏览器中打开。这个表单需要等待人工填写。如果你正在使用 AI agent，请不要停止当前进程，CLI 会继续等待表单提交结果。",
         "uiReady": "本地 setup 表单已就绪。",
         "uiReadyHelp": "如果没有自动打开浏览器，请复制下面的地址到浏览器中继续。CLI 会继续等待表单提交，请保持当前终端会话继续运行。",
-        "uiOpenBrowserFallback": "无法自动打开浏览器。请复制上面的地址到浏览器中继续 setup，并保持当前终端会话继续运行。如果你正在使用 AI agent，请不要停止当前进程。"
+        "uiOpenBrowserFallback": "无法自动打开浏览器。请复制上面的地址到浏览器中继续 setup，并保持当前终端会话继续运行。如果你正在使用 AI agent，请不要停止当前进程。",
+        "skillsSyncRegistryUnavailable": "无法访问 npm registry 来同步 NocoBase AI coding skills。将跳过 skills 安装并继续执行 init。等 registry 可访问后，再运行 `nb skills install` 即可。"
       },
       "prompts": {
         "appName": {
@@ -308,6 +336,9 @@
         "apiBaseUrl": {
           "message": "API 基础地址",
           "placeholder": "https://demo.example.com/api 或 https://demo.example.com/api/__app/<subapp>"
+        },
+        "skipDownload": {
+          "message": "是否跳过下载 NocoBase，直接复用已有的本地应用文件或 Docker 镜像？"
         }
       },
       "webUi": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.0-beta.36",
+  "version": "2.1.0-beta.37",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -108,5 +108,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "397d45c744f6eb48b3a0cd785c87cbf1257c3513"
+  "gitHead": "7132e5b83ecc0e42b54715eaf1429c72bcef34ae"
 }