@nocobase/cli 2.1.0-beta.21 → 2.1.0-beta.22

package/dist/commands/env/add.js

@@ -9,6 +9,7 @@
 import { Args, Command, Flags } from '@oclif/core';
 import { upsertEnv } from '../../lib/auth-store.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
+import { buildStoredEnvConfig, } from '../../lib/env-config.js';
 import { runPromptCatalog, } from '../../lib/prompt-catalog.js';
 import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, localeText, } from '../../lib/cli-locale.js';
 import { validateApiBaseUrl } from '../../lib/prompt-validators.js';
@@ -33,6 +34,10 @@ const ENV_RUNTIME_FLAG_MAP = {
     'db-database': 'dbDatabase',
     'db-user': 'dbUser',
     'db-password': 'dbPassword',
+    'root-username': 'rootUsername',
+    'root-email': 'rootEmail',
+    'root-password': 'rootPassword',
+    'root-nickname': 'rootNickname',
 };
 const ENV_BOOLEAN_RUNTIME_FLAG_MAP = {
     'builtin-db': 'builtinDb',
@@ -185,6 +190,22 @@ export default class EnvAdd extends Command {
             hidden: true,
             description: 'Database password saved with this env',
         }),
+        'root-username': Flags.string({
+            hidden: true,
+            description: 'Initial root username saved with this env',
+        }),
+        'root-email': Flags.string({
+            hidden: true,
+            description: 'Initial root email saved with this env',
+        }),
+        'root-password': Flags.string({
+            hidden: true,
+            description: 'Initial root password saved with this env',
+        }),
+        'root-nickname': Flags.string({
+            hidden: true,
+            description: 'Initial root nickname saved with this env',
+        }),
     };
     static prompts = {
         name: {
@@ -250,36 +271,20 @@ export default class EnvAdd extends Command {
         return initialValues;
     }
     buildEnvConfig(results, flags) {
-        const source = String(flags.source ?? '').trim();
-        const appRootPath = String(flags['app-root-path'] ?? '').trim();
-        const kind = source === 'docker'
-            ? 'docker'
-            : source === 'npm' || source === 'git' || source === 'local' || appRootPath
-                ? 'local'
-                : 'http';
-        const envConfig = {
-            kind,
-            apiBaseUrl: String(results.apiBaseUrl ?? ''),
+        const envConfigInput = {
+            apiBaseUrl: results.apiBaseUrl,
+            authType: results.authType,
+            accessToken: results.accessToken,
         };
         for (const [flagName, configKey] of Object.entries(ENV_RUNTIME_FLAG_MAP)) {
             const value = flags[flagName];
-            if (typeof value === 'string' && value.trim() !== '') {
-                envConfig[configKey] = value.trim();
-            }
+            envConfigInput[configKey] = value;
         }
         for (const [flagName, configKey] of Object.entries(ENV_BOOLEAN_RUNTIME_FLAG_MAP)) {
             const value = flags[flagName];
-            if (typeof value === 'boolean') {
-                envConfig[configKey] = value;
-            }
-        }
-        if (flags['builtin-db'] === false) {
-            envConfig.builtinDbImage = undefined;
-        }
-        if (results.authType === 'token' && results.accessToken != null) {
-            envConfig.accessToken = String(results.accessToken);
+            envConfigInput[configKey] = value;
         }
-        return envConfig;
+        return buildStoredEnvConfig(envConfigInput);
     }
     async run() {
         const { args, flags } = await this.parse(EnvAdd);

package/dist/commands/{prompts-stages.js → examples/prompts-stages.js}

@@ -7,9 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Args, Command, Flags } from '@oclif/core';
-import { runPromptCatalog, } from "../lib/prompt-catalog.js";
-import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, } from "../lib/cli-locale.js";
-import { runPromptCatalogWebUI } from "../lib/prompt-web-ui.js";
+import { runPromptCatalog, } from "../../lib/prompt-catalog.js";
+import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, } from "../../lib/cli-locale.js";
+import { runPromptCatalogWebUI } from "../../lib/prompt-web-ui.js";
 import PromptsTest from "./prompts-test.js";
 function buildWebUiStagesFromTestPrompts(c) {
     return [

package/dist/commands/{prompts-test.js → examples/prompts-test.js}

@@ -8,9 +8,9 @@
  */
 import * as p from '@clack/prompts';
 import { Args, Command, Flags } from '@oclif/core';
-import { runPromptCatalog, } from "../lib/prompt-catalog.js";
-import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, } from "../lib/cli-locale.js";
-import { runPromptCatalogWebUI, } from "../lib/prompt-web-ui.js";
+import { runPromptCatalog, } from "../../lib/prompt-catalog.js";
+import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, } from "../../lib/cli-locale.js";
+import { runPromptCatalogWebUI, } from "../../lib/prompt-web-ui.js";
 export default class PromptsTest extends Command {
     static hidden = true;
     static args = {

package/dist/commands/init.js

@@ -171,6 +171,26 @@ Prompt modes:
         '<%= config.bin %> <%= command.id %> --ui --ui-port 3000',
     ];
     static prompts = {
+        seedResume: {
+            type: 'run',
+            run: (values, command) => {
+                const record = values;
+                if (record.resume === undefined) {
+                    const flags = command?.parsedFlagsForPromptSeeds;
+                    record.resume = Boolean(flags?.resume);
+                }
+            },
+        },
+        seedEnvName: {
+            type: 'run',
+            run: (values) => {
+                const record = values;
+                const appName = String(record.appName ?? '').trim();
+                if (appName && record.env === undefined) {
+                    record.env = appName;
+                }
+            },
+        },
         appName: {
             type: 'text',
             message: initText('prompts.appName.message'),
@@ -256,6 +276,7 @@ Prompt modes:
         rootPassword: newInstallOnly(Install.rootUserPrompts.rootPassword),
         rootNickname: newInstallOnly(Install.rootUserPrompts.rootNickname),
     };
+    parsedFlagsForPromptSeeds;
     static flags = {
         yes: Flags.boolean({
             char: 'y',
@@ -274,6 +295,11 @@ Prompt modes:
             description: 'Show detailed command output',
             default: false,
         }),
+        'skip-skills': Flags.boolean({
+            description: 'Skip installing or updating NocoBase AI coding skills during init',
+            hidden: true,
+            default: false,
+        }),
         'ui-host': Flags.string({
             description: 'Host for the local --ui setup server (default: 127.0.0.1)',
         }),
@@ -290,6 +316,9 @@ Prompt modes:
         applyCliLocale(parsedResult.flags.locale);
         const flags = parsedResult.flags;
         const normalizedFlags = { ...flags };
+        this.parsedFlagsForPromptSeeds = {
+            resume: Boolean(normalizedFlags.resume),
+        };
         if (normalizedFlags.ui && normalizedFlags.yes) {
             this.error('--ui cannot be used with --yes.');
         }
@@ -307,7 +336,9 @@ Prompt modes:
                 this.exit(1);
             }
             p.intro(initTitle());
-            await this.syncNocoBaseSkills();
+            await this.syncNocoBaseSkills({
+                skip: Boolean(normalizedFlags['skip-skills']),
+            });
             try {
                 await this.config.runCommand('install', this.buildResumeInstallArgv(normalizedFlags));
             }
@@ -321,6 +352,24 @@ Prompt modes:
         const interactive = Boolean(stdinStream.isTTY && stdoutStream.isTTY);
         const useBrowserUi = Boolean(normalizedFlags.ui);
         let presetValues = this.buildPresetValuesFromFlags(normalizedFlags);
+        if (normalizedFlags.resume) {
+            const resumeEnvName = String(normalizedFlags.env ?? '').trim();
+            if (resumeEnvName) {
+                const resumeEnv = await getEnv(resumeEnvName, {
+                    scope: resolveDefaultConfigScope(),
+                });
+                if (resumeEnv) {
+                    const savedAppPort = String(resumeEnv.config.appPort ?? '').trim();
+                    const savedDbPort = String(resumeEnv.config.dbPort ?? '').trim();
+                    if (savedAppPort) {
+                        presetValues.resumeSavedAppPort = savedAppPort;
+                    }
+                    if (savedDbPort) {
+                        presetValues.resumeSavedDbPort = savedDbPort;
+                    }
+                }
+            }
+        }
         if (normalizedFlags.yes && !String(presetValues.appName ?? '').trim()) {
             const formatted = formatSkippedAppNameRequiredMessage();
             p.log.error(highlightInitValidationMessage(formatted));
@@ -385,7 +434,9 @@ Prompt modes:
         if (existingEnv && Boolean(normalizedFlags.force)) {
             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();
+        await this.syncNocoBaseSkills({
+            skip: Boolean(normalizedFlags['skip-skills']),
+        });
         let managedInstallResults;
         try {
             // oclif explicit registry keys use `:` (e.g. `env:add`); users still type `nb env add`.
@@ -397,7 +448,7 @@ Prompt modes:
                 p.log.step('Saving the local env config');
                 await this.persistManagedEnvConfig(results, normalizedFlags);
                 managedInstallResults = results;
-                p.log.step('Running nb install');
+                p.log.step('Running nb init');
                 await this.config.runCommand('install', this.buildInstallArgv(results, normalizedFlags));
             }
         }
@@ -647,7 +698,11 @@ Prompt modes:
     hasAgentsDirInCwd() {
         return existsSync(path.resolve(process.cwd(), '.agents'));
     }
-    async syncNocoBaseSkills() {
+    async syncNocoBaseSkills(options) {
+        if (options?.skip) {
+            p.log.step('Skipped NocoBase agent skills sync.');
+            return;
+        }
         try {
             const status = await inspectSkillsStatus();
             if (!status.installed) {
@@ -682,6 +737,9 @@ Prompt modes:
         const dbDatabase = String(results.dbDatabase ?? '').trim();
         const dbUser = String(results.dbUser ?? '').trim();
         const dbPassword = String(results.dbPassword ?? '');
+        const apiBaseUrl = String(results.apiBaseUrl ?? '').trim();
+        const authType = String(results.authType ?? '').trim() || 'oauth';
+        const accessToken = String(results.accessToken ?? '');
         const builtinDb = explicitDbHostFlag(flags)
             ? false
             : results.builtinDb === undefined
@@ -695,7 +753,8 @@ Prompt modes:
                     : appPort
                         ? { kind: 'http' }
                         : {}),
-            ...(appPort ? { apiBaseUrl: `http://127.0.0.1:${appPort}/api` } : {}),
+            ...(apiBaseUrl ? { apiBaseUrl } : appPort ? { apiBaseUrl: `http://127.0.0.1:${appPort}/api` } : {}),
+            ...(authType === 'token' && accessToken ? { accessToken } : {}),
             ...(source ? { source } : {}),
             ...(version ? { downloadVersion: version } : {}),
             ...(dockerRegistry ? { dockerRegistry } : {}),
@@ -736,6 +795,9 @@ Prompt modes:
         const processArgv = process.argv.slice(2);
         const envName = String(results.appName ?? DEFAULT_INIT_APP_NAME).trim() || DEFAULT_INIT_APP_NAME;
         const source = String(results.source ?? '').trim();
+        const apiBaseUrl = String(results.apiBaseUrl ?? '').trim();
+        const authType = String(results.authType ?? '').trim();
+        const accessToken = String(results.accessToken ?? '');
         argv.push('--env', envName);
         if (options?.resume) {
             argv.push('--resume');
@@ -743,6 +805,15 @@ Prompt modes:
         if (Boolean(flags.verbose)) {
             argv.push('--verbose');
         }
+        if (apiBaseUrl) {
+            argv.push('--api-base-url', apiBaseUrl);
+        }
+        if (authType) {
+            argv.push('--auth-type', authType);
+        }
+        if (authType === 'token' && accessToken) {
+            argv.push('--access-token', accessToken);
+        }
         const lang = String(results.lang ?? '').trim();
         if (lang) {
             argv.push('--lang', lang);