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

package/dist/lib/run-npm.js

@@ -19,9 +19,39 @@ import fsp from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import spawn from 'cross-spawn';
+import { translateCli } from './cli-locale.js';
+import { resolveConfiguredCommandName } from './cli-config.js';
 const FORWARDED_SIGNALS = ['SIGINT', 'SIGTERM'];
-function resolveCommandName(name) {
-    return name;
+const PROCESS_TIMEOUT_FORCE_KILL_DELAY_MS = 1000;
+const MISSING_COMMAND_SPECS = {
+    docker: {
+        displayName: 'Docker',
+        configKey: 'bin.docker',
+    },
+    git: {
+        displayName: 'Git',
+        configKey: 'bin.git',
+    },
+    yarn: {
+        displayName: 'Yarn',
+        configKey: 'bin.yarn',
+    },
+};
+async function resolveCommandName(name) {
+    return await resolveConfiguredCommandName(name);
+}
+function createMissingCommandError(name, label, error) {
+    const code = error && typeof error === 'object' && 'code' in error ? String(error.code) : undefined;
+    if (code !== 'ENOENT') {
+        return undefined;
+    }
+    if (!Object.prototype.hasOwnProperty.call(MISSING_COMMAND_SPECS, name)) {
+        return undefined;
+    }
+    const spec = MISSING_COMMAND_SPECS[name];
+    return new Error(translateCli('commands.shared.missingCommand', { action: label, displayName: spec.displayName, configKey: spec.configKey }, {
+        fallback: `Couldn't run \`${label}\` because the ${spec.displayName} executable could not be found. Install ${spec.displayName} or update \`nb config set ${spec.configKey} <path>\` and try again.`,
+    }));
 }
 function pathExists(candidate) {
     try {
@@ -40,8 +70,8 @@ function isDirectory(candidate) {
     }
 }
 function hasLocalNocoBaseBinary(candidate) {
-    return (pathExists(path.join(candidate, 'node_modules', '.bin', 'nocobase-v1'))
-        || pathExists(path.join(candidate, 'node_modules', '.bin', 'nocobase-v1.cmd')));
+    return (pathExists(path.join(candidate, 'node_modules', '.bin', 'nocobase-v1')) ||
+        pathExists(path.join(candidate, 'node_modules', '.bin', 'nocobase-v1.cmd')));
 }
 export function resolveCwd(cwd) {
     const next = cwd ?? process.cwd();
@@ -61,10 +91,7 @@ export function resolveProjectCwd(cwd) {
         throw new Error(`The specified --cwd is not a directory: ${fallback}`);
     }
     let current = hasExplicitInput ? fallback : process.cwd();
-    while (true) {
-        if (hasLocalNocoBaseBinary(current)) {
-            return current;
-        }
+    while (!hasLocalNocoBaseBinary(current)) {
         const parent = path.dirname(current);
         if (parent === current) {
             if (hasExplicitInput) {
@@ -74,12 +101,13 @@ export function resolveProjectCwd(cwd) {
         }
         current = parent;
     }
+    return current;
 }
-export function run(name, args, options) {
+export async function run(name, args, options) {
     const cwd = resolveCwd(options?.cwd);
     const label = options?.errorName ?? name;
-    const command = resolveCommandName(name);
-    return new Promise((resolve, reject) => {
+    const command = await resolveCommandName(name);
+    return await new Promise((resolve, reject) => {
         const child = spawn(command, [...args], {
             stdio: options?.stdio ?? 'inherit',
             cwd,
@@ -104,12 +132,19 @@ export function run(name, args, options) {
             }
         }
         const cleanupSignalForwarding = forwardSignalsToChild(child);
+        const timeoutController = attachProcessTimeout(child, options?.timeoutMs);
         child.once('error', (error) => {
+            timeoutController.cleanup();
             cleanupSignalForwarding();
-            reject(error);
+            reject(createMissingCommandError(name, label, error) ?? error);
         });
         child.once('close', (code, signal) => {
+            timeoutController.cleanup();
             cleanupSignalForwarding();
+            if (timeoutController.didTimeout()) {
+                reject(new Error(`${label} timed out after ${options?.timeoutMs}ms`));
+                return;
+            }
             if (code === 0) {
                 resolve();
                 return;
@@ -122,6 +157,46 @@ export function run(name, args, options) {
         });
     });
 }
+function attachProcessTimeout(child, timeoutMs) {
+    if (!timeoutMs || timeoutMs <= 0) {
+        return {
+            cleanup: () => undefined,
+            didTimeout: () => false,
+        };
+    }
+    let didTimeout = false;
+    let forceKillTimer;
+    const isChildRunning = () => child.exitCode === null && child.signalCode === null;
+    const terminateChild = (signal) => {
+        if (!isChildRunning()) {
+            return;
+        }
+        try {
+            child.kill(signal);
+        }
+        catch {
+            // Ignore kill errors here and let the child close/error handlers surface the failure.
+        }
+    };
+    const timeoutTimer = setTimeout(() => {
+        didTimeout = true;
+        terminateChild('SIGTERM');
+        forceKillTimer = setTimeout(() => {
+            terminateChild('SIGKILL');
+        }, PROCESS_TIMEOUT_FORCE_KILL_DELAY_MS);
+        forceKillTimer.unref?.();
+    }, timeoutMs);
+    timeoutTimer.unref?.();
+    return {
+        cleanup: () => {
+            clearTimeout(timeoutTimer);
+            if (forceKillTimer) {
+                clearTimeout(forceKillTimer);
+            }
+        },
+        didTimeout: () => didTimeout,
+    };
+}
 function forwardSignalsToChild(child) {
     let forwardedSignalCount = 0;
     const listeners = new Map();
@@ -149,10 +224,11 @@ function forwardSignalsToChild(child) {
         }
     };
 }
-export function commandSucceeds(name, args, options) {
+export async function commandSucceeds(name, args, options) {
     const cwd = resolveCwd(options?.cwd);
-    const command = resolveCommandName(name);
-    return new Promise((resolve) => {
+    const label = options?.errorName ?? name;
+    const command = await resolveCommandName(name);
+    return await new Promise((resolve, reject) => {
         const child = spawn(command, [...args], {
             cwd,
             env: {
@@ -162,15 +238,31 @@ export function commandSucceeds(name, args, options) {
             stdio: 'ignore',
             windowsHide: process.platform === 'win32',
         });
-        child.once('error', () => resolve(false));
-        child.once('close', (code) => resolve(code === 0));
+        const timeoutController = attachProcessTimeout(child, options?.timeoutMs);
+        child.once('error', (error) => {
+            timeoutController.cleanup();
+            const missingCommandError = createMissingCommandError(name, label, error);
+            if (missingCommandError) {
+                reject(missingCommandError);
+                return;
+            }
+            resolve(false);
+        });
+        child.once('close', (code) => {
+            timeoutController.cleanup();
+            if (timeoutController.didTimeout()) {
+                resolve(false);
+                return;
+            }
+            resolve(code === 0);
+        });
     });
 }
-export function commandOutput(name, args, options) {
+export async function commandOutput(name, args, options) {
     const cwd = resolveCwd(options?.cwd);
     const label = options?.errorName ?? name;
-    const command = resolveCommandName(name);
-    return new Promise((resolve, reject) => {
+    const command = await resolveCommandName(name);
+    return await new Promise((resolve, reject) => {
         const child = spawn(command, [...args], {
             cwd,
             env: {
@@ -190,8 +282,17 @@ export function commandOutput(name, args, options) {
         child.stderr.on('data', (chunk) => {
             stderr += chunk;
         });
-        child.once('error', reject);
+        const timeoutController = attachProcessTimeout(child, options?.timeoutMs);
+        child.once('error', (error) => {
+            timeoutController.cleanup();
+            reject(createMissingCommandError(name, label, error) ?? error);
+        });
         child.once('close', (code, signal) => {
+            timeoutController.cleanup();
+            if (timeoutController.didTimeout()) {
+                reject(new Error(`${label} timed out after ${options?.timeoutMs}ms`));
+                return;
+            }
             if (code === 0) {
                 resolve(stdout.trim());
                 return;
@@ -216,7 +317,7 @@ async function readCommandOutputFile(filePath) {
 export async function commandOutputViaFile(name, args, options) {
     const cwd = resolveCwd(options?.cwd);
     const label = options?.errorName ?? name;
-    const command = resolveCommandName(name);
+    const command = await resolveCommandName(name);
     const captureDir = await fsp.mkdtemp(path.join(os.tmpdir(), 'nocobase-cli-output-'));
     const stdoutPath = path.join(captureDir, 'stdout.log');
     const stderrPath = path.join(captureDir, 'stderr.log');
@@ -233,8 +334,17 @@ export async function commandOutputViaFile(name, args, options) {
                 stdio: ['ignore', stdoutHandle.fd, stderrHandle.fd],
                 windowsHide: process.platform === 'win32',
             });
-            child.once('error', reject);
+            const timeoutController = attachProcessTimeout(child, options?.timeoutMs);
+            child.once('error', (error) => {
+                timeoutController.cleanup();
+                reject(createMissingCommandError(name, label, error) ?? error);
+            });
             child.once('close', (code, signal) => {
+                timeoutController.cleanup();
+                if (timeoutController.didTimeout()) {
+                    reject(new Error(`${label} timed out after ${options?.timeoutMs}ms`));
+                    return;
+                }
                 resolve({ code, signal });
             });
         });

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);
 }
@@ -61,6 +127,12 @@ async function readManagedSkillsState(workspaceRoot) {
         return undefined;
     }
 }
+export async function readInstalledManagedSkillsVersion(options = {}) {
+    const globalRoot = resolveSkillsRoot(options);
+    const state = await readManagedSkillsState(globalRoot);
+    const installedVersion = String(state?.installedVersion ?? state?.installedRef ?? '').trim();
+    return installedVersion || undefined;
+}
 async function writeManagedSkillsState(workspaceRoot, state) {
     const filePath = getManagedSkillsStateFile(workspaceRoot);
     await fsp.mkdir(path.dirname(filePath), { recursive: true });
@@ -72,6 +144,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 +168,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 +261,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 +351,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 +390,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/lib/ui.js

@@ -54,7 +54,10 @@ export function printInfo(message) {
     console.log(pc.cyan(message));
 }
 export function announceTargetEnv(envName) {
-    printInfo(`Target env: ${envName}`);
+    if (process.env.NB_SKIP_TARGET_ENV_LOG === '1') {
+        return;
+    }
+    printInfo(`Using env "${envName}".`);
 }
 export function printVerbose(message) {
     if (!verboseMode) {

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": {
@@ -340,5 +371,55 @@
         }
       }
     }
+  },
+  "apiCommandCompat": {
+    "refusalTitle": "Refusing to run `nb api {{commandId}}` because the current CLI version is {{cliVersion}} while the target app version is {{appVersion}}.",
+    "refusalTitleMissingVersion": "Refusing to run `nb api {{commandId}}` because the {{versionLabel}} is unavailable.",
+    "refusalTitleGeneric": "Refusing to run `nb api {{commandId}}` because the current version combination is not compatible.",
+    "currentVersionsLine": "Current versions: {{versions}}.",
+    "refusalBodyWithRequirements": "This API command is blocked when used with {{requirements}}.",
+    "refusalBody": "This API command may not be compatible with the current CLI and app version combination.",
+    "channel": {
+      "stable": "stable",
+      "beta": "beta",
+      "alpha": "alpha",
+      "rc": "rc",
+      "unknownPrerelease": "unsupported prerelease"
+    },
+    "requirement": {
+      "cli": "CLI version {{condition}}",
+      "app": "app version {{condition}}",
+      "skills": "NocoBase AI skills version {{condition}}",
+      "appChannel": "{{channelLabel}} app version {{condition}}",
+      "appUnknownPrereleaseBlocked": "{{channelLabel}} app versions are blocked"
+    },
+    "currentVersion": {
+      "cli": "CLI {{version}}",
+      "app": "app {{version}}",
+      "appUnavailable": "app unavailable",
+      "skills": "NocoBase AI skills {{version}}",
+      "skillsUnavailable": "NocoBase AI skills unavailable"
+    },
+    "versionLabel": {
+      "cli": "CLI version",
+      "app": "target app version",
+      "skills": "installed NocoBase AI skills version"
+    },
+    "join": {
+      "two": "{{left}} and {{right}}",
+      "many": "{{head}}, and {{tail}}"
+    },
+    "continueTitle": "To continue:",
+    "continueUpgradeApp": "- upgrade the app to a compatible version",
+    "continueUpgradeAppToVersion": "- upgrade the app to {{suggestedUpgradeTarget}}",
+    "continueUseSupportedAppVersion": "- use a supported app version: {{supportedTargets}}",
+    "continueRefreshAppVersion": "- refresh the target env runtime so the current app version can be detected, then retry",
+    "continueUseCompatibleCli": "- or use a compatible CLI version",
+    "continueUseCompatibleCliVersion": "- or use a CLI version {{suggestedCliTarget}}",
+    "continueUpdateSkillsToVersion": "- install or update the NocoBase AI coding skills to {{suggestedSkillsUpgradeTarget}}. Run `nb skills update --yes` to refresh the managed skills.",
+    "continueUseCompatibleSkillsVersion": "- or use a NocoBase AI skills version {{suggestedSkillsTarget}}",
+    "continueInstallOrUpdateSkillsToVersion": "- run `nb skills install --yes` or `nb skills update --yes`, and make sure the managed skills version is {{suggestedSkillsUpgradeTarget}} before retrying",
+    "continueInstallOrUpdateSkills": "- run `nb skills install --yes` or `nb skills update --yes`, then retry once the managed skills version is available",
+    "supportedAppTarget": "{{channelLabel}} {{target}}"
   }
 }