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

package/dist/commands/init.js

@@ -15,9 +15,10 @@ import { stdin as stdinStream, stdout as stdoutStream } from 'node:process';
 import { getEnv, upsertEnv } from "../lib/auth-store.js";
 import { runPromptCatalog, } from "../lib/prompt-catalog.js";
 import { applyCliLocale, localeText, translateCli } from "../lib/cli-locale.js";
+import { resolveDefaultConfigScope } from '../lib/cli-home.js';
 import { runPromptCatalogWebUI, } from "../lib/prompt-web-ui.js";
 import { validateApiBaseUrl, validateEnvKey } from "../lib/prompt-validators.js";
-import { installNocoBaseSkills } from '../lib/skills-manager.js';
+import { inspectSkillsStatus, installNocoBaseSkills, updateNocoBaseSkills, } from '../lib/skills-manager.js';
 import Download from "./download.js";
 import EnvAdd from "./env/add.js";
 import Install, { defaultDbPortForDialect } from "./install.js";
@@ -25,7 +26,14 @@ import _ from 'lodash';
 const DEFAULT_INIT_API_BASE_URL = 'http://localhost:13000/api';
 const DEFAULT_INIT_APP_NAME = 'local';
 const DOWNLOAD_OUTPUT_DIR_PROMPT = Download.prompts.outputDir;
-const CONFIG_SCOPE = 'project';
+const INIT_ENV_ADD_FLAG_NAMES = [
+    'locale',
+    'default-api-base-url',
+    'api-base-url',
+    'auth-type',
+    'access-token',
+    'token',
+];
 const initText = (key, values) => localeText(`commands.init.${key}`, values);
 function withExtraHidden(def, extraHidden) {
     if (def.type === 'run') {
@@ -55,6 +63,27 @@ function resolveInitDownloadVersion(results) {
     }
     return preset;
 }
+function initVersionPromptValue(version) {
+    return version === 'latest' || version === 'beta' || version === 'alpha'
+        ? version
+        : 'other';
+}
+function yesInitialValue(def, fallback) {
+    if ('yesInitialValue' in def && def.yesInitialValue !== undefined) {
+        return String(def.yesInitialValue);
+    }
+    return fallback;
+}
+function hasDownloadOverride(flags) {
+    return Boolean(String(flags.source ?? '').trim()
+        || String(flags.version ?? '').trim());
+}
+function explicitApiBaseUrlFlag(flags) {
+    return String(flags['api-base-url'] ?? '').trim();
+}
+function explicitDbHostFlag(flags) {
+    return String(flags['db-host'] ?? '').trim();
+}
 function shouldAllowExistingInitEnv() {
     return argvHasToken(process.argv.slice(2), ['--force', '-f']);
 }
@@ -67,7 +96,7 @@ async function validateInitAppName(value) {
     if (!envName) {
         return undefined;
     }
-    const existingEnv = await getEnv(envName, { scope: 'project' });
+    const existingEnv = await getEnv(envName, { scope: resolveDefaultConfigScope() });
     if (existingEnv) {
         if (shouldAllowExistingInitEnv()) {
             return undefined;
@@ -94,6 +123,11 @@ function formatSkippedAppNameRequiredMessage() {
         translateCli('commands.init.messages.appNameEnvHelp'),
     ].join('\n');
 }
+function shellQuoteArg(value) {
+    return /^[A-Za-z0-9_@%+=:,./-]+$/.test(value)
+        ? value
+        : `'${value.replace(/'/g, `'\\''`)}'`;
+}
 function initTitle() {
     return translateCli('commands.init.messages.title');
 }
@@ -162,12 +196,6 @@ Prompt modes:
             yesInitialValue: 'no',
             required: true,
         },
-        installSkills: {
-            type: 'boolean',
-            message: initText('prompts.installSkills.message'),
-            initialValue: true,
-            yesInitialValue: true,
-        },
         apiBaseUrl: existingAppOnly({
             type: 'text',
             message: initText('prompts.apiBaseUrl.message'),
@@ -238,10 +266,6 @@ Prompt modes:
             char: 'e',
             description: 'Env name for this setup. Required with --yes and --resume',
         }),
-        'install-skills': Flags.boolean({
-            description: 'Install NocoBase AI coding skills (`nocobase/skills`) for this workspace',
-            default: false,
-        }),
         ui: Flags.boolean({
             description: 'Open the guided setup flow in a local browser form (not valid with --yes)',
             default: false,
@@ -258,6 +282,7 @@ Prompt modes:
             min: 0,
             max: 65535,
         }),
+        ..._.pick(EnvAdd.flags, INIT_ENV_ADD_FLAG_NAMES),
         ..._.omit(Install.flags, ['yes', 'env']),
     };
     async run() {
@@ -282,24 +307,12 @@ Prompt modes:
                 this.exit(1);
             }
             p.intro(initTitle());
-            if (Boolean(normalizedFlags['install-skills'])) {
-                try {
-                    p.log.step('Installing NocoBase agent skills (nb skills install)');
-                    await installNocoBaseSkills();
-                }
-                catch (error) {
-                    const message = error instanceof Error ? error.message : String(error);
-                    p.outro(pc.red(`Skills install failed: ${message}`));
-                    this.error(message);
-                }
-            }
+            await this.syncNocoBaseSkills();
             try {
-                p.log.step(`Resuming setup for env "${envName}" from the saved workspace config`);
                 await this.config.runCommand('install', this.buildResumeInstallArgv(normalizedFlags));
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : String(error);
-                p.outro(pc.red(message));
                 this.error(message);
             }
             p.outro('Workspace init finished.');
@@ -365,28 +378,15 @@ Prompt modes:
             },
             command: this,
         });
-        const installSkills = Boolean(results.installSkills);
         const hasNocobase = results.hasNocobase === 'yes';
         const existingEnv = !hasNocobase
-            ? await getEnv(String(results.appName ?? '').trim(), { scope: 'project' })
+            ? await getEnv(String(results.appName ?? '').trim(), { scope: resolveDefaultConfigScope() })
             : undefined;
         if (existingEnv && Boolean(normalizedFlags.force)) {
-            p.log.warn(`Reconfiguring existing env ${pc.cyan(pc.bold(`"${existingEnv.name}"`))} in this workspace because ${pc.bold('--force')} was set. The env config will be updated before install starts, then refreshed again after install succeeds.`);
-        }
-        if (installSkills) {
-            try {
-                p.log.step('Installing NocoBase agent skills (nb skills install)');
-                await installNocoBaseSkills();
-            }
-            catch (error) {
-                const message = error instanceof Error ? error.message : String(error);
-                p.outro(pc.red(`Skills install failed: ${message}`));
-                this.error(message);
-            }
-        }
-        else {
-            p.log.info('Skipped NocoBase agent skills install.');
+            p.log.warn(`Reconfiguring existing env ${pc.cyan(pc.bold(`"${existingEnv.name}"`))} from the global config because ${pc.bold('--force')} was set. The env config will be updated before install starts, then refreshed again after install succeeds.`);
         }
+        await this.syncNocoBaseSkills();
+        let managedInstallResults;
         try {
             // oclif explicit registry keys use `:` (e.g. `env:add`); users still type `nb env add`.
             if (hasNocobase) {
@@ -395,15 +395,19 @@ Prompt modes:
             }
             else {
                 p.log.step('Saving the local env config');
-                await this.persistManagedEnvConfig(results);
+                await this.persistManagedEnvConfig(results, normalizedFlags);
+                managedInstallResults = results;
                 p.log.step('Running nb install');
                 await this.config.runCommand('install', this.buildInstallArgv(results, normalizedFlags));
             }
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            p.outro(pc.red(message));
-            this.error(message);
+            const formatted = managedInstallResults
+                ? this.formatManagedInstallFailureMessage(message, managedInstallResults, normalizedFlags)
+                : message;
+            p.outro(pc.red(formatted));
+            this.exit(1);
         }
         p.outro('Workspace init finished.');
     }
@@ -451,7 +455,6 @@ Prompt modes:
                 catalog: {
                     appName: c.appName,
                     hasNocobase: c.hasNocobase,
-                    installSkills: c.installSkills,
                 },
             },
             {
@@ -525,6 +528,22 @@ Prompt modes:
         if (flags.env !== undefined && String(flags.env).trim() !== '') {
             preset.appName = String(flags.env).trim();
         }
+        const apiBaseUrl = explicitApiBaseUrlFlag(flags);
+        if (apiBaseUrl) {
+            preset.hasNocobase = 'yes';
+            preset.apiBaseUrl = apiBaseUrl;
+        }
+        else if (flags['default-api-base-url'] !== undefined
+            && String(flags['default-api-base-url']).trim() !== '') {
+            preset.apiBaseUrl = String(flags['default-api-base-url']).trim();
+        }
+        if (flags['auth-type'] !== undefined && String(flags['auth-type']).trim() !== '') {
+            preset.authType = String(flags['auth-type']).trim();
+        }
+        const accessToken = String(flags['access-token'] ?? flags.token ?? '');
+        if (flags['access-token'] !== undefined || flags.token !== undefined) {
+            preset.accessToken = accessToken;
+        }
         if (flags.lang !== undefined && String(flags.lang).trim() !== '') {
             preset.lang = String(flags.lang).trim();
         }
@@ -557,6 +576,7 @@ Prompt modes:
         }
         if (flags['db-host'] !== undefined && String(flags['db-host']).trim() !== '') {
             preset.dbHost = String(flags['db-host']).trim();
+            preset.builtinDb = false;
         }
         if (flags['db-port'] !== undefined && String(flags['db-port']).trim() !== '') {
             preset.dbPort = String(flags['db-port']).trim();
@@ -577,7 +597,11 @@ Prompt modes:
             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 = initVersionPromptValue(version);
+            if (preset.version === 'other') {
+                preset.otherVersion = version;
+            }
         }
         if (flags['docker-registry'] !== undefined && String(flags['docker-registry']).trim() !== '') {
             preset.dockerRegistry = String(flags['docker-registry']).trim();
@@ -609,21 +633,38 @@ Prompt modes:
         if (argvHasToken(argv, ['--build-dts', '--no-build-dts'])) {
             preset.buildDts = Boolean(flags['build-dts']);
         }
-        if (argvHasToken(argv, ['--builtin-db'])) {
+        if (argvHasToken(argv, ['--builtin-db', '--no-builtin-db'])) {
             preset.builtinDb = Boolean(flags['builtin-db']);
         }
-        if (argvHasToken(argv, ['--install-skills'])) {
-            preset.installSkills = Boolean(flags['install-skills']);
+        if (explicitDbHostFlag(flags)) {
+            preset.builtinDb = false;
         }
-        else if (this.hasAgentsDirInCwd()) {
-            preset.installSkills = false;
+        if (!preset.hasNocobase && hasDownloadOverride(flags)) {
+            preset.hasNocobase = 'no';
         }
         return preset;
     }
     hasAgentsDirInCwd() {
         return existsSync(path.resolve(process.cwd(), '.agents'));
     }
-    async persistManagedEnvConfig(results) {
+    async syncNocoBaseSkills() {
+        try {
+            const status = await inspectSkillsStatus();
+            if (!status.installed) {
+                p.log.step('Installing NocoBase agent skills (nb skills install)');
+                await installNocoBaseSkills();
+                return;
+            }
+            p.log.step('Updating NocoBase agent skills (nb skills update)');
+            await updateNocoBaseSkills();
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            p.outro(pc.red(`Skills sync failed: ${message}`));
+            this.exit(1);
+        }
+    }
+    async persistManagedEnvConfig(results, flags = {}) {
         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();
@@ -641,8 +682,20 @@ Prompt modes:
         const dbDatabase = String(results.dbDatabase ?? '').trim();
         const dbUser = String(results.dbUser ?? '').trim();
         const dbPassword = String(results.dbPassword ?? '');
+        const builtinDb = explicitDbHostFlag(flags)
+            ? false
+            : results.builtinDb === undefined
+                ? undefined
+                : Boolean(results.builtinDb);
         await upsertEnv(envName, {
-            ...(appPort ? { baseUrl: `http://127.0.0.1:${appPort}/api` } : {}),
+            ...(source === 'docker'
+                ? { kind: 'docker' }
+                : source || appRootPath
+                    ? { kind: 'local' }
+                    : appPort
+                        ? { kind: 'http' }
+                        : {}),
+            ...(appPort ? { apiBaseUrl: `http://127.0.0.1:${appPort}/api` } : {}),
             ...(source ? { source } : {}),
             ...(version ? { downloadVersion: version } : {}),
             ...(dockerRegistry ? { dockerRegistry } : {}),
@@ -655,20 +708,19 @@ Prompt modes:
             ...(results.devDependencies !== undefined ? { devDependencies: Boolean(results.devDependencies) } : {}),
             ...(results.build !== undefined ? { build: Boolean(results.build) } : {}),
             ...(results.buildDts !== undefined ? { buildDts: Boolean(results.buildDts) } : {}),
-            ...(results.builtinDb !== undefined ? { builtinDb: Boolean(results.builtinDb) } : {}),
+            ...(builtinDb !== undefined ? { builtinDb } : {}),
             ...(dbDialect ? { dbDialect } : {}),
-            ...(builtinDbImage || results.builtinDb === false ? { builtinDbImage: builtinDbImage || undefined } : {}),
+            ...(builtinDbImage || builtinDb === false ? { builtinDbImage: builtinDbImage || undefined } : {}),
             ...(dbHost ? { dbHost } : {}),
             ...(dbPort ? { dbPort } : {}),
             ...(dbDatabase ? { dbDatabase } : {}),
             ...(dbUser ? { dbUser } : {}),
             ...(dbPassword ? { dbPassword } : {}),
-        }, { scope: CONFIG_SCOPE });
+        }, { scope: resolveDefaultConfigScope() });
     }
     buildEnvAddArgv(results) {
         const argv = [String(results.appName ?? DEFAULT_INIT_APP_NAME)];
         argv.push('--no-intro');
-        argv.push('--scope', CONFIG_SCOPE);
         argv.push('--api-base-url', String(results.apiBaseUrl ?? DEFAULT_INIT_API_BASE_URL));
         argv.push('--auth-type', String(results.authType ?? 'oauth'));
         if (results.authType === 'token') {
@@ -758,10 +810,15 @@ Prompt modes:
                 argv.push('--build-dts');
             }
         }
-        const builtinDb = Boolean(results.builtinDb);
+        const explicitDbHost = explicitDbHostFlag(flags);
+        const dbHost = explicitDbHost || String(results.dbHost ?? '').trim();
+        const builtinDb = explicitDbHost ? false : Boolean(results.builtinDb);
         if (builtinDb) {
             argv.push('--builtin-db');
         }
+        else if (explicitDbHost || results.builtinDb !== undefined) {
+            argv.push('--no-builtin-db');
+        }
         const dbDialect = String(results.dbDialect ?? '').trim();
         if (dbDialect) {
             argv.push('--db-dialect', dbDialect);
@@ -770,7 +827,6 @@ Prompt modes:
         if (builtinDb && builtinDbImage) {
             argv.push('--builtin-db-image', builtinDbImage);
         }
-        const dbHost = String(results.dbHost ?? '').trim();
         if (dbHost) {
             argv.push('--db-host', dbHost);
         }
@@ -813,8 +869,80 @@ Prompt modes:
         }
         return argv;
     }
+    buildManagedInstallResumeCommand(results, flags) {
+        const argv = ['nb', 'init'];
+        if (Boolean(flags.yes)) {
+            argv.push('--yes');
+        }
+        const envName = String(results.appName ?? DEFAULT_INIT_APP_NAME).trim() || DEFAULT_INIT_APP_NAME;
+        argv.push('--env', envName);
+        if (Boolean(results.fetchSource)) {
+            const source = String(results.source ?? '').trim();
+            if (source) {
+                argv.push('--source', source);
+            }
+            const version = resolveInitDownloadVersion(results);
+            if (version) {
+                argv.push('--version', version);
+            }
+            const outputDir = String(results.outputDir ?? '').trim();
+            if (outputDir && outputDir !== String(results.appRootPath ?? '').trim()) {
+                argv.push('--output-dir', outputDir);
+            }
+            const gitUrl = String(results.gitUrl ?? '').trim();
+            if (gitUrl) {
+                argv.push('--git-url', gitUrl);
+            }
+            const dockerRegistry = String(results.dockerRegistry ?? '').trim();
+            if (dockerRegistry) {
+                argv.push('--docker-registry', dockerRegistry);
+            }
+            const dockerPlatform = String(results.dockerPlatform ?? '').trim();
+            if (dockerPlatform) {
+                argv.push('--docker-platform', dockerPlatform);
+            }
+            const npmRegistry = String(results.npmRegistry ?? '').trim();
+            if (npmRegistry) {
+                argv.push('--npm-registry', npmRegistry);
+            }
+            if (Boolean(results.devDependencies)) {
+                argv.push('--dev-dependencies');
+            }
+            if (Boolean(results.dockerSave)) {
+                argv.push('--docker-save');
+            }
+            if (results.build !== undefined && !Boolean(results.build)) {
+                argv.push('--no-build');
+            }
+            if (Boolean(results.buildDts)) {
+                argv.push('--build-dts');
+            }
+        }
+        argv.push('--resume', '--verbose');
+        return argv.map(shellQuoteArg).join(' ');
+    }
+    formatManagedInstallFailureMessage(message, results, flags) {
+        const command = this.buildManagedInstallResumeCommand(results, flags);
+        return [
+            message,
+            '',
+            translateCli('commands.init.messages.resumeAfterInstallFailure', { command }),
+        ].join('\n');
+    }
     buildResumeInstallArgv(flags) {
-        return this.buildInstallArgv(this.buildPresetValuesFromFlags(flags), flags, {
+        const preset = this.buildPresetValuesFromFlags(flags);
+        if (flags.yes) {
+            preset.lang ??= yesInitialValue(Install.appPrompts.lang, 'en-US');
+            preset.rootUsername ??= yesInitialValue(Install.rootUserPrompts.rootUsername, 'nocobase');
+            preset.rootEmail ??= yesInitialValue(Install.rootUserPrompts.rootEmail, 'admin@nocobase.com');
+            preset.rootPassword ??= yesInitialValue(Install.rootUserPrompts.rootPassword, 'admin123');
+            preset.rootNickname ??= yesInitialValue(Install.rootUserPrompts.rootNickname, 'Super Admin');
+        }
+        if (hasDownloadOverride(flags)) {
+            preset.fetchSource ??= true;
+        }
+        preset.replace ??= true;
+        return this.buildInstallArgv(preset, flags, {
             nonInteractive: Boolean(flags.yes),
             resume: true,
         });