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

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 {
@@ -31,9 +61,17 @@ function pathExists(candidate) {
         return false;
     }
 }
+function isDirectory(candidate) {
+    try {
+        return Boolean(candidate) && fs.statSync(candidate).isDirectory();
+    }
+    catch {
+        return false;
+    }
+}
 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();
@@ -45,29 +83,31 @@ export function resolveCwd(cwd) {
 export function resolveProjectCwd(cwd) {
     const normalizedCwd = typeof cwd === 'string' && cwd.trim() === '' ? undefined : cwd;
     const fallback = resolveCwd(normalizedCwd);
-    const isAbsoluteInput = typeof normalizedCwd === 'string' && path.isAbsolute(normalizedCwd);
-    let current = isAbsoluteInput ? fallback : process.cwd();
-    while (true) {
-        const candidate = isAbsoluteInput
-            ? current
-            : normalizedCwd
-                ? path.resolve(current, normalizedCwd)
-                : current;
-        if (hasLocalNocoBaseBinary(candidate)) {
-            return candidate;
-        }
+    const hasExplicitInput = normalizedCwd !== undefined;
+    if (hasExplicitInput && !pathExists(fallback)) {
+        throw new Error(`The specified --cwd does not exist: ${fallback}`);
+    }
+    if (hasExplicitInput && !isDirectory(fallback)) {
+        throw new Error(`The specified --cwd is not a directory: ${fallback}`);
+    }
+    let current = hasExplicitInput ? fallback : process.cwd();
+    while (!hasLocalNocoBaseBinary(current)) {
         const parent = path.dirname(current);
         if (parent === current) {
+            if (hasExplicitInput) {
+                throw new Error(`Couldn't find a NocoBase source project from --cwd: ${fallback}`);
+            }
             return fallback;
         }
         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,
@@ -77,13 +117,34 @@ export function run(name, args, options) {
             },
             windowsHide: process.platform === 'win32',
         });
+        if (options?.stdio === 'pipe') {
+            child.stdout?.setEncoding('utf8');
+            child.stderr?.setEncoding('utf8');
+            if (options.onStdout) {
+                child.stdout?.on('data', (chunk) => {
+                    options.onStdout?.(String(chunk));
+                });
+            }
+            if (options.onStderr) {
+                child.stderr?.on('data', (chunk) => {
+                    options.onStderr?.(String(chunk));
+                });
+            }
+        }
         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;
@@ -96,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();
@@ -123,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: {
@@ -136,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: {
@@ -164,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;
@@ -190,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');
@@ -207,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);
 }
@@ -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/lib/source-publish.js

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import path from 'node:path';
-import { commandOutput, resolveProjectCwd, run } from './run-npm.js';
+import { commandOutput, resolveProjectCwd, run, runNocoBaseCommand } from './run-npm.js';
 import { DEFAULT_SOURCE_REGISTRY_PORT, parseSourceRegistryUrl, resolveSourceRegistryInfo } from './source-registry.js';
 function trimValue(value) {
     return String(value ?? '').trim();
@@ -98,6 +98,16 @@ async function commitSourceSnapshotVersion(params) {
         errorName: 'git commit',
     });
 }
+async function buildSourceSnapshot(params) {
+    const args = ['build'];
+    if (!params.buildDts) {
+        args.push('--no-dts');
+    }
+    await runNocoBaseCommand(args, {
+        cwd: params.cwd,
+        stdio: params.stdio,
+    });
+}
 async function createSourcePublishStash(params) {
     if (!(await hasLocalGitChanges(params.cwd))) {
         return undefined;
@@ -158,6 +168,8 @@ export async function publishSourceSnapshot(params) {
     const version = buildSnapshotVersion(baseVersion, gitSha, params.now);
     const temporaryBranch = buildSourcePublishBranchName(gitSha, params.now);
     const stdio = params.verbose ? 'inherit' : 'ignore';
+    const shouldBuild = params.build !== false;
+    const shouldBuildDts = params.buildDts !== false;
     let stash;
     let onTemporaryBranch = false;
     let branchCreated = false;
@@ -186,6 +198,13 @@ export async function publishSourceSnapshot(params) {
                 errorName: 'git stash apply',
             });
         }
+        if (shouldBuild) {
+            await buildSourceSnapshot({
+                cwd: projectRoot,
+                buildDts: shouldBuildDts,
+                stdio,
+            });
+        }
         await run('yarn', ['lerna', 'version', version, '--force-publish=*', '--no-git-tag-version', '-y'], {
             cwd: projectRoot,
             errorName: 'lerna version',

package/dist/lib/source-registry.js

@@ -9,7 +9,7 @@
 import fsp from 'node:fs/promises';
 import path from 'node:path';
 import { commandOutput, commandSucceeds, resolveCwd, resolveProjectCwd, run } from './run-npm.js';
-import { resolveCliHomeRoot } from './cli-home.js';
+import { resolveCliHomeDir } from './cli-home.js';
 export const DEFAULT_SOURCE_REGISTRY_HOST = '127.0.0.1';
 export const DEFAULT_SOURCE_REGISTRY_PORT = 4873;
 export const DEFAULT_SOURCE_REGISTRY_CONTAINER_NAME = 'nb-source-registry';
@@ -31,7 +31,7 @@ function asPosixPathForDockerMount(value) {
     return resolveCwd(value).replace(/\\/g, '/');
 }
 export function resolveSourceRegistryRootDir() {
-    return path.join(resolveCliHomeRoot(), 'verdaccio');
+    return path.join(resolveCliHomeDir(), 'verdaccio');
 }
 export function resolveSourceRegistryConfigPath() {
     return path.join(resolveSourceRegistryRootDir(), 'config.yaml');

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": {