@nocobase/cli 2.1.0-alpha.22 → 2.1.0-alpha.24

package/README.md

@@ -147,6 +147,8 @@ In non-interactive mode, pass these setup-only flags again because they are not
 | `nb env` | Manage saved CLI env connections. |
 | `nb api` | Call NocoBase API resources from the CLI. |
 | `nb pm` | Manage plugins for the selected NocoBase env. |
+| `nb self` | Check or update the installed NocoBase CLI. |
+| `nb skills` | Check, install, or update NocoBase AI coding skills for the current workspace. |
 
 Recommended style: use `--env` explicitly for app/runtime commands. `-e` is the short form:
 
@@ -166,6 +168,35 @@ nb upgrade -e app1
 nb db start -e app1
 ```
 
+## CLI And Skills Updates
+
+Check whether the installed CLI itself is up to date:
+
+```bash
+nb self check
+nb self check --json
+```
+
+Update the CLI when it is installed globally with npm:
+
+```bash
+nb self update
+```
+
+Check whether the current workspace already has the NocoBase AI coding skills:
+
+```bash
+nb skills check
+nb skills check --json
+```
+
+Install the skills for the first time, or update an existing `nocobase/skills` install:
+
+```bash
+nb skills install
+nb skills update
+```
+
 ## Runtime Types
 
 ### Docker

package/bin/run.js

@@ -38,18 +38,20 @@ function reexecWithTsx() {
     process.exit(1);
   }
 
-  const result = spawnSync(
-    process.execPath,
-    ['--import', pathToFileURL(tsxEntry).href, '--disable-warning=ExperimentalWarning', ...process.argv.slice(1)],
-    {
-      stdio: 'inherit',
-      env: {
-        ...process.env,
-        _NOCO_CLI_TSX_CHILD: '1',
-        NODE_ENV: 'development',
-      },
+  const reexecArgs = ['--import', pathToFileURL(tsxEntry).href];
+  const supportedFlags = Array.from(process.allowedNodeEnvironmentFlags);
+  if (supportedFlags.some((flag) => flag === '--disable-warning' || flag.startsWith('--disable-warning='))) {
+    reexecArgs.push('--disable-warning=ExperimentalWarning');
+  }
+
+  const result = spawnSync(process.execPath, [...reexecArgs, ...process.argv.slice(1)], {
+    stdio: 'inherit',
+    env: {
+      ...process.env,
+      _NOCO_CLI_TSX_CHILD: '1',
+      NODE_ENV: 'development',
     },
-  );
+  });
   process.exit(result.status === null ? 1 : result.status);
 }
 

package/dist/commands/download.js

@@ -12,13 +12,15 @@ import * as p from '@clack/prompts';
 import path from 'node:path';
 import { stdin as stdinStream, stdout as stdoutStream } from 'node:process';
 import { runPromptCatalog, } from "../lib/prompt-catalog.js";
-import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, localeText, } from "../lib/cli-locale.js";
+import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, localeText, resolveCliLocale, translateCli, } from "../lib/cli-locale.js";
 import { run } from "../lib/run-npm.js";
 import { printVerbose, setVerboseMode, startTask, stopTask, updateTask } from '../lib/ui.js';
 const DEFAULT_DOCKER_REGISTRY = 'nocobase/nocobase';
 const DEFAULT_DOCKER_REGISTRY_ZH_CN = 'registry.cn-shanghai.aliyuncs.com/nocobase/nocobase';
 const DEFAULT_DOCKER_PLATFORM = 'auto';
+const DEFAULT_DOWNLOAD_VERSION = 'beta';
 const downloadText = (key, values) => localeText(`commands.download.${key}`, values);
+const downloadTranslatedText = (key, values, fallback) => translateCli(`commands.download.${key}`, values, { fallback });
 function defaultOutputDirForVersion(versionTag) {
     const safe = versionTag.replace(/[/\\]/g, '-');
     return `./nocobase-${safe}`;
@@ -33,10 +35,13 @@ async function pathExists(target) {
     }
 }
 export function defaultDockerRegistryForLang(lang) {
-    return String(lang ?? '').trim() === 'zh-CN'
+    return resolveCliLocale(String(lang ?? '').trim() || undefined) === 'zh-CN'
         ? DEFAULT_DOCKER_REGISTRY_ZH_CN
         : DEFAULT_DOCKER_REGISTRY;
 }
+function defaultDockerRegistryForPromptValues(_values) {
+    return defaultDockerRegistryForLang(process.env.NB_LOCALE);
+}
 function argvHasToken(argv, tokens) {
     return tokens.some((t) => argv.includes(t));
 }
@@ -81,8 +86,64 @@ function dockerPlatformArg(value) {
     }
     return platform;
 }
+function formatDownloadStageFailure(stage) {
+    return [
+        downloadTranslatedText(`failures.${stage}.title`),
+        downloadTranslatedText(`failures.${stage}.body`),
+        downloadTranslatedText(`failures.${stage}.hint`),
+    ].join('\n');
+}
+function formatDownloadFailure(message, verbose) {
+    if (verbose) {
+        return message;
+    }
+    const lower = message.toLowerCase();
+    if (lower.includes('yarn install')) {
+        return formatDownloadStageFailure('dependencyInstall');
+    }
+    if (lower.includes('git clone')) {
+        return formatDownloadStageFailure('gitClone');
+    }
+    if (lower.includes('docker pull')) {
+        return formatDownloadStageFailure('dockerPull');
+    }
+    if (lower.includes('docker save')) {
+        return formatDownloadStageFailure('dockerSave');
+    }
+    if (lower.includes('create-nocobase-app') || lower.includes('npx create-nocobase-app')) {
+        return formatDownloadStageFailure('scaffold');
+    }
+    if (lower.includes('nocobase command')) {
+        return formatDownloadStageFailure('build');
+    }
+    if (lower.includes('exited with code') || lower.includes('exited due to signal')) {
+        return formatDownloadStageFailure('generic');
+    }
+    return message;
+}
 const EXTERNAL_COMMAND_LOADING_DELAY_MS = 8_000;
 const EXTERNAL_COMMAND_LOADING_UPDATE_MS = 15_000;
+function normalizeVersionPreset(value) {
+    const text = String(value ?? '').trim();
+    if (text === 'latest' || text === 'beta' || text === 'alpha') {
+        return text;
+    }
+    return 'other';
+}
+function versionPresetForValue(value) {
+    return normalizeVersionPreset(value);
+}
+function otherVersionValue(value) {
+    const text = String(value ?? '').trim();
+    return normalizeVersionPreset(text) === 'other' ? text : '';
+}
+function resolveVersionFromResults(results, fallback) {
+    const preset = normalizeVersionPreset(results.version ?? fallback);
+    if (preset === 'other') {
+        return String(results.otherVersion ?? fallback ?? '').trim();
+    }
+    return preset;
+}
 export default class Download extends Command {
     _flags;
     preparationTaskActive = false;
@@ -176,30 +237,72 @@ export default class Download extends Command {
     static prompts = {
         source: {
             type: 'select',
+            variant: 'radio',
             message: downloadText('prompts.source.message'),
             options: [
-                { value: 'npm', label: downloadText('prompts.source.npmLabel') },
-                { value: 'git', label: downloadText('prompts.source.gitLabel') },
-                { value: 'docker', label: downloadText('prompts.source.dockerLabel') },
+                {
+                    value: 'docker',
+                    label: downloadText('prompts.source.dockerLabel'),
+                    hint: downloadText('prompts.source.dockerHint'),
+                },
+                {
+                    value: 'npm',
+                    label: downloadText('prompts.source.npmLabel'),
+                    hint: downloadText('prompts.source.npmHint'),
+                },
+                {
+                    value: 'git',
+                    label: downloadText('prompts.source.gitLabel'),
+                    hint: downloadText('prompts.source.gitHint'),
+                },
             ],
             yesInitialValue: 'docker',
             initialValue: 'docker',
             required: true,
         },
         version: {
-            type: 'text',
+            type: 'select',
+            variant: 'radio',
             message: downloadText('prompts.version.message'),
-            placeholder: downloadText('prompts.version.placeholder'),
-            initialValue: 'alpha',
-            yesInitialValue: 'alpha',
+            options: [
+                {
+                    value: 'latest',
+                    label: downloadText('prompts.version.latestLabel'),
+                    hint: downloadText('prompts.version.latestHint'),
+                    disabled: true,
+                },
+                {
+                    value: 'beta',
+                    label: downloadText('prompts.version.betaLabel'),
+                    hint: downloadText('prompts.version.betaHint'),
+                },
+                {
+                    value: 'alpha',
+                    label: downloadText('prompts.version.alphaLabel'),
+                    hint: downloadText('prompts.version.alphaHint'),
+                },
+                {
+                    value: 'other',
+                    label: downloadText('prompts.version.otherLabel'),
+                    hint: downloadText('prompts.version.otherHint'),
+                },
+            ],
+            initialValue: DEFAULT_DOWNLOAD_VERSION,
+            yesInitialValue: DEFAULT_DOWNLOAD_VERSION,
+            required: true,
+        },
+        otherVersion: {
+            type: 'text',
+            message: downloadText('prompts.otherVersion.message'),
+            placeholder: downloadText('prompts.otherVersion.placeholder'),
             required: true,
+            hidden: (values) => normalizeVersionPreset(values.version) !== 'other',
         },
         dockerRegistry: {
             type: 'text',
             message: downloadText('prompts.dockerRegistry.message'),
             placeholder: downloadText('prompts.dockerRegistry.placeholder'),
-            initialValue: (values) => defaultDockerRegistryForLang(values.lang),
-            yesInitialValue: DEFAULT_DOCKER_REGISTRY,
+            initialValue: defaultDockerRegistryForPromptValues,
             required: true,
             hidden: (values) => values.source !== 'docker',
         },
@@ -239,7 +342,10 @@ export default class Download extends Command {
             type: 'text',
             message: downloadText('prompts.outputDir.message'),
             placeholder: downloadText('prompts.outputDir.placeholder'),
-            initialValue: (values) => defaultOutputDirForVersion(String(values.version ?? 'latest').trim() || 'latest'),
+            initialValue: (values) => {
+                const version = resolveVersionFromResults(values, DEFAULT_DOWNLOAD_VERSION) || DEFAULT_DOWNLOAD_VERSION;
+                return defaultOutputDirForVersion(version);
+            },
             required: true,
             hidden: (values) => {
                 const s = values.source;
@@ -315,7 +421,7 @@ export default class Download extends Command {
         return outputAbs;
     }
     dockerTarPath(flags, outputAbs) {
-        const image = flags['docker-registry'] ?? DEFAULT_DOCKER_REGISTRY;
+        const image = String(flags['docker-registry'] ?? '').trim() || defaultDockerRegistryForLang(process.env.NB_LOCALE);
         const tag = flags.version ?? 'latest';
         const safeBase = `${image.replace(/[/:]/g, '-')}-${tag.replace(/[/\\]/g, '-')}`;
         return path.join(outputAbs, `${safeBase}.tar`);
@@ -326,12 +432,15 @@ export default class Download extends Command {
      */
     buildInitialValuesFromParsed(flags, preset) {
         const initialValues = {};
+        const localeDefaultDockerRegistry = defaultDockerRegistryForLang(flags.locale ?? process.env.NB_LOCALE);
         const source = flags.source?.trim();
         if (source) {
             initialValues.source = source;
         }
         if (flags.version !== undefined) {
-            initialValues.version = flags.version.trim() || 'latest';
+            const version = flags.version.trim() || 'latest';
+            initialValues.version = versionPresetForValue(version);
+            initialValues.otherVersion = otherVersionValue(version);
         }
         initialValues.replace = flags.replace;
         initialValues.devDependencies = flags['dev-dependencies'];
@@ -346,6 +455,9 @@ export default class Download extends Command {
         if (flags['docker-registry'] !== undefined) {
             initialValues.dockerRegistry = String(flags['docker-registry'] ?? '').trim();
         }
+        else {
+            initialValues.dockerRegistry = localeDefaultDockerRegistry;
+        }
         initialValues.dockerPlatform = normalizeDockerPlatform(flags['docker-platform']);
         initialValues.dockerSave = flags['docker-save'];
         if (flags['npm-registry'] !== undefined) {
@@ -370,7 +482,11 @@ export default class Download extends Command {
             preset.source = String(flags.source).trim();
         }
         if (flags.version !== undefined) {
-            preset.version = String(flags.version).trim() || 'latest';
+            const version = String(flags.version).trim() || 'latest';
+            preset.version = versionPresetForValue(version);
+            if (normalizeVersionPreset(version) === 'other') {
+                preset.otherVersion = version;
+            }
         }
         if (flags['docker-registry'] !== undefined) {
             const v = String(flags['docker-registry'] ?? '').trim();
@@ -424,7 +540,7 @@ export default class Download extends Command {
     }
     mapCatalogResultsToResolved(results, flags) {
         const source = String(results.source);
-        const version = String(results.version ?? '').trim() || 'latest';
+        const version = resolveVersionFromResults(results, flags.version) || 'latest';
         const devDependencies = source === 'npm' ? Boolean(results.devDependencies) : undefined;
         const effectiveBuild = this.resolveEffectiveBuild(source, results, flags);
         const buildDtsWant = results.buildDts !== undefined ? Boolean(results.buildDts) : flags['build-dts'];
@@ -435,9 +551,11 @@ export default class Download extends Command {
         const gitUrl = results.gitUrl !== undefined
             ? String(results.gitUrl).trim() || undefined
             : flags['git-url']?.trim() || undefined;
-        const dockerRegistry = results.dockerRegistry !== undefined
-            ? String(results.dockerRegistry).trim() || undefined
-            : flags['docker-registry']?.trim() || undefined;
+        const dockerRegistry = source === 'docker'
+            ? (results.dockerRegistry !== undefined
+                ? String(results.dockerRegistry).trim() || undefined
+                : flags['docker-registry']?.trim() || defaultDockerRegistryForLang(flags.locale ?? process.env.NB_LOCALE))
+            : undefined;
         const dockerPlatform = source === 'docker'
             ? normalizeDockerPlatform(results.dockerPlatform !== undefined
                 ? results.dockerPlatform
@@ -490,9 +608,13 @@ export default class Download extends Command {
             },
         });
         const source = String(results.source ?? '').trim();
+        const version = resolveVersionFromResults(results, flags.version);
         if (!source || !['docker', 'npm', 'git'].includes(source)) {
             this.error('Download source is required. Choose npm, git, or docker.');
         }
+        if (!version) {
+            this.error('Version is required. Choose alpha, beta, latest, or enter another version.');
+        }
         if (flags['docker-save'] && source !== 'docker') {
             this.error('--docker-save is only available when --source docker is selected.');
         }
@@ -586,7 +708,7 @@ export default class Download extends Command {
         return argv;
     }
     async downloadFromDocker(flags) {
-        const image = flags['docker-registry'] ?? DEFAULT_DOCKER_REGISTRY;
+        const image = String(flags['docker-registry'] ?? '').trim() || defaultDockerRegistryForLang(process.env.NB_LOCALE);
         const tag = flags.version ?? 'latest';
         const imageRef = `${image}:${tag}`;
         const platform = dockerPlatformArg(flags['docker-platform']);
@@ -737,7 +859,7 @@ export default class Download extends Command {
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            this.error(message);
+            this.error(formatDownloadFailure(message, this.isVerbose()));
         }
     }
 }

package/dist/commands/init.js

@@ -17,7 +17,7 @@ import { runPromptCatalog, } from "../lib/prompt-catalog.js";
 import { applyCliLocale, localeText, translateCli } from "../lib/cli-locale.js";
 import { runPromptCatalogWebUI, } from "../lib/prompt-web-ui.js";
 import { validateApiBaseUrl, validateEnvKey } from "../lib/prompt-validators.js";
-import { run } from "../lib/run-npm.js";
+import { installNocoBaseSkills } from '../lib/skills-manager.js';
 import Download from "./download.js";
 import EnvAdd from "./env/add.js";
 import Install, { defaultDbPortForDialect } from "./install.js";
@@ -48,6 +48,13 @@ function downloadInNewInstallOnly(def) {
 function argvHasToken(argv, tokens) {
     return tokens.some((token) => argv.includes(token));
 }
+function resolveInitDownloadVersion(results) {
+    const preset = String(results.version ?? '').trim();
+    if (preset === 'other') {
+        return String(results.otherVersion ?? '').trim();
+    }
+    return preset;
+}
 function shouldAllowExistingInitEnv() {
     return argvHasToken(process.argv.slice(2), ['--force', '-f']);
 }
@@ -177,6 +184,7 @@ Prompt modes:
         fetchSource: newInstallOnly(Install.appPrompts.fetchSource),
         source: downloadInNewInstallOnly(Download.prompts.source),
         version: downloadInNewInstallOnly(Download.prompts.version),
+        otherVersion: downloadInNewInstallOnly(Download.prompts.otherVersion),
         dockerRegistry: downloadInNewInstallOnly(Download.prompts.dockerRegistry),
         dockerPlatform: downloadInNewInstallOnly(Download.prompts.dockerPlatform),
         dockerSave: downloadInNewInstallOnly(Download.prompts.dockerSave),
@@ -238,6 +246,10 @@ Prompt modes:
             description: 'Open the guided setup flow in a local browser form (not valid with --yes)',
             default: false,
         }),
+        verbose: Flags.boolean({
+            description: 'Show detailed command output',
+            default: false,
+        }),
         'ui-host': Flags.string({
             description: 'Host for the local --ui setup server (default: 127.0.0.1)',
         }),
@@ -272,8 +284,8 @@ Prompt modes:
             p.intro(initTitle());
             if (Boolean(normalizedFlags['install-skills'])) {
                 try {
-                    p.log.step('Installing NocoBase agent skills (npx -y skills add nocobase/skills)');
-                    await run('npx', ['-y', 'skills', 'add', 'nocobase/skills', '-y']);
+                    p.log.step('Installing NocoBase agent skills (nb skills install)');
+                    await installNocoBaseSkills();
                 }
                 catch (error) {
                     const message = error instanceof Error ? error.message : String(error);
@@ -363,8 +375,8 @@ Prompt modes:
         }
         if (installSkills) {
             try {
-                p.log.step('Installing NocoBase agent skills (npx -y skills add nocobase/skills)');
-                await run('npx', ['-y', 'skills', 'add', 'nocobase/skills', '-y']);
+                p.log.step('Installing NocoBase agent skills (nb skills install)');
+                await installNocoBaseSkills();
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : String(error);
@@ -468,6 +480,7 @@ Prompt modes:
                 catalog: {
                     source: c.source,
                     version: c.version,
+                    otherVersion: c.otherVersion,
                     dockerRegistry: c.dockerRegistry,
                     dockerPlatform: c.dockerPlatform,
                     dockerSave: c.dockerSave,
@@ -614,7 +627,7 @@ Prompt modes:
         const envName = String(results.appName ?? DEFAULT_INIT_APP_NAME).trim() || DEFAULT_INIT_APP_NAME;
         const appPort = String(results.appPort ?? '').trim();
         const source = String(results.source ?? '').trim();
-        const version = String(results.version ?? '').trim();
+        const version = resolveInitDownloadVersion(results);
         const dockerRegistry = String(results.dockerRegistry ?? '').trim();
         const dockerPlatform = String(results.dockerPlatform ?? '').trim();
         const gitUrl = String(results.gitUrl ?? '').trim();
@@ -675,6 +688,9 @@ Prompt modes:
         if (options?.resume) {
             argv.push('--resume');
         }
+        if (Boolean(flags.verbose)) {
+            argv.push('--verbose');
+        }
         const lang = String(results.lang ?? '').trim();
         if (lang) {
             argv.push('--lang', lang);
@@ -699,7 +715,7 @@ Prompt modes:
             if (source) {
                 argv.push('--source', source);
             }
-            const version = String(results.version ?? '').trim();
+            const version = resolveInitDownloadVersion(results);
             if (version) {
                 argv.push('--version', version);
             }