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

package/dist/commands/init.js

@@ -15,9 +15,9 @@ 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 { runPromptCatalogWebUI } from "../lib/prompt-web-ui.js";
 import { validateApiBaseUrl, validateEnvKey } from "../lib/prompt-validators.js";
-import { inspectSkillsStatus, installNocoBaseSkills, updateNocoBaseSkills, } from '../lib/skills-manager.js';
+import { installNocoBaseSkills, isNpmRegistryUnavailable } from '../lib/skills-manager.js';
 import { omitKeys, pickKeys } from "../lib/object-utils.js";
 import { printInfo, printStage, printVerbose, printWarning } from '../lib/ui.js';
 import Download from "./download.js";
@@ -33,6 +33,8 @@ const INIT_ENV_ADD_FLAG_NAMES = [
     'auth-type',
     'access-token',
     'token',
+    'username',
+    'password',
     'skip-auth',
 ];
 const initText = (key, values) => localeText(`commands.init.${key}`, values);
@@ -51,8 +53,8 @@ function existingAppOnly(def) {
 function newInstallOnly(def) {
     return withExtraHidden(def, (values) => values.hasNocobase !== 'no');
 }
-function downloadInNewInstallOnly(def) {
-    return withExtraHidden(def, (values) => values.hasNocobase !== 'no' || values.fetchSource !== true);
+function newInstallDownloadExecutionOnly(def) {
+    return withExtraHidden(def, (values) => values.hasNocobase !== 'no' || values.skipDownload === true);
 }
 function argvHasToken(argv, tokens) {
     return tokens.some((token) => argv.includes(token));
@@ -65,9 +67,7 @@ function resolveInitDownloadVersion(results) {
     return preset;
 }
 function initVersionPromptValue(version) {
-    return version === 'latest' || version === 'beta' || version === 'alpha'
-        ? version
-        : 'other';
+    return version === 'latest' || version === 'beta' || version === 'alpha' ? version : 'other';
 }
 function yesInitialValue(def, fallback) {
     if ('yesInitialValue' in def && def.yesInitialValue !== undefined) {
@@ -76,8 +76,7 @@ function yesInitialValue(def, fallback) {
     return fallback;
 }
 function hasDownloadOverride(flags) {
-    return Boolean(String(flags.source ?? '').trim()
-        || String(flags.version ?? '').trim());
+    return Boolean(String(flags.source ?? '').trim() || String(flags.version ?? '').trim());
 }
 function explicitApiBaseUrlFlag(flags) {
     return String(flags['api-base-url'] ?? '').trim();
@@ -125,9 +124,7 @@ function formatSkippedAppNameRequiredMessage() {
     ].join('\n');
 }
 function shellQuoteArg(value) {
-    return /^[A-Za-z0-9_@%+=:,./-]+$/.test(value)
-        ? value
-        : `'${value.replace(/'/g, `'\\''`)}'`;
+    return /^[A-Za-z0-9_@%+=:,./-]+$/.test(value) ? value : `'${value.replace(/'/g, `'\\''`)}'`;
 }
 function initTitle() {
     return 'Set up NocoBase';
@@ -234,20 +231,27 @@ Prompt modes:
             validate: validateApiBaseUrl,
         }),
         authType: existingAppOnly(EnvAdd.prompts.authType),
+        username: existingAppOnly(EnvAdd.prompts.username),
+        password: existingAppOnly(EnvAdd.prompts.password),
         accessToken: existingAppOnly(EnvAdd.prompts.accessToken),
         lang: newInstallOnly(Install.appPrompts.lang),
         appRootPath: newInstallOnly(Install.appPrompts.appRootPath),
         appPort: newInstallOnly(Install.appPrompts.appPort),
         storagePath: newInstallOnly(Install.appPrompts.storagePath),
-        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),
-        gitUrl: downloadInNewInstallOnly(Download.prompts.gitUrl),
-        outputDir: downloadInNewInstallOnly({
+        skipDownload: newInstallOnly({
+            type: 'boolean',
+            message: initText('prompts.skipDownload.message'),
+            initialValue: false,
+            yesInitialValue: false,
+        }),
+        source: newInstallOnly(Download.prompts.source),
+        version: newInstallOnly(Download.prompts.version),
+        otherVersion: newInstallOnly(Download.prompts.otherVersion),
+        dockerRegistry: newInstallOnly(Download.prompts.dockerRegistry),
+        dockerPlatform: newInstallOnly(Download.prompts.dockerPlatform),
+        dockerSave: newInstallDownloadExecutionOnly(Download.prompts.dockerSave),
+        gitUrl: newInstallOnly(Download.prompts.gitUrl),
+        outputDir: newInstallDownloadExecutionOnly({
             ...DOWNLOAD_OUTPUT_DIR_PROMPT,
             hidden: (values) => {
                 const source = String(values.source ?? '').trim();
@@ -268,11 +272,11 @@ Prompt modes:
                 return typeof initialValue === 'function' ? initialValue(values) : String(initialValue ?? '');
             },
         }),
-        npmRegistry: downloadInNewInstallOnly(Download.prompts.npmRegistry),
-        replace: downloadInNewInstallOnly(Download.prompts.replace),
-        devDependencies: downloadInNewInstallOnly(Download.prompts.devDependencies),
-        build: downloadInNewInstallOnly(Download.prompts.build),
-        buildDts: downloadInNewInstallOnly(Download.prompts.buildDts),
+        npmRegistry: newInstallOnly(Download.prompts.npmRegistry),
+        replace: newInstallDownloadExecutionOnly(Download.prompts.replace),
+        devDependencies: newInstallDownloadExecutionOnly(Download.prompts.devDependencies),
+        build: newInstallDownloadExecutionOnly(Download.prompts.build),
+        buildDts: newInstallDownloadExecutionOnly(Download.prompts.buildDts),
         dbDialect: newInstallOnly(Install.dbPrompts.dbDialect),
         builtinDb: newInstallOnly(Install.dbPrompts.builtinDb),
         builtinDbImage: newInstallOnly(Install.dbPrompts.builtinDbImage),
@@ -281,23 +285,36 @@ Prompt modes:
         dbDatabase: newInstallOnly(Install.dbPrompts.dbDatabase),
         dbUser: newInstallOnly(Install.dbPrompts.dbUser),
         dbPassword: newInstallOnly(Install.dbPrompts.dbPassword),
+        dbSchema: newInstallOnly(Install.dbPrompts.dbSchema),
+        dbTablePrefix: newInstallOnly(Install.dbPrompts.dbTablePrefix),
+        dbUnderscored: newInstallOnly(Install.dbPrompts.dbUnderscored),
         rootUsername: newInstallOnly(Install.rootUserPrompts.rootUsername),
         rootEmail: newInstallOnly(Install.rootUserPrompts.rootEmail),
         rootPassword: newInstallOnly(Install.rootUserPrompts.rootPassword),
         rootNickname: newInstallOnly(Install.rootUserPrompts.rootNickname),
     };
     buildPromptCatalog(flags) {
-        if (!flags['skip-auth']) {
-            return Init.prompts;
-        }
-        const accessTokenPrompt = {
-            ...EnvAdd.prompts.accessToken,
-            hidden: () => true,
-        };
-        return {
+        const prompts = {
             ...Init.prompts,
-            accessToken: existingAppOnly(accessTokenPrompt),
         };
+        if (flags['skip-auth']) {
+            const accessTokenPrompt = {
+                ...EnvAdd.prompts.accessToken,
+                hidden: () => true,
+            };
+            const usernamePrompt = {
+                ...EnvAdd.prompts.username,
+                hidden: () => true,
+            };
+            const passwordPrompt = {
+                ...EnvAdd.prompts.password,
+                hidden: () => true,
+            };
+            prompts.username = existingAppOnly(usernamePrompt);
+            prompts.password = existingAppOnly(passwordPrompt);
+            prompts.accessToken = existingAppOnly(accessTokenPrompt);
+        }
+        return prompts;
     }
     parsedFlagsForPromptSeeds;
     static flags = {
@@ -319,7 +336,7 @@ Prompt modes:
             default: false,
         }),
         'skip-skills': Flags.boolean({
-            description: 'Skip installing or updating NocoBase AI coding skills during init',
+            description: 'Skip installing NocoBase AI coding skills during init',
             default: false,
         }),
         'ui-host': Flags.string({
@@ -344,15 +361,14 @@ Prompt modes:
         if (normalizedFlags.ui && normalizedFlags.yes) {
             this.error('--ui cannot be used with --yes.');
         }
-        if (normalizedFlags['skip-auth']
-            && (normalizedFlags['access-token'] !== undefined || normalizedFlags.token !== undefined)) {
+        if (normalizedFlags['skip-auth'] &&
+            (normalizedFlags['access-token'] !== undefined || normalizedFlags.token !== undefined)) {
             this.error('--skip-auth cannot be used with --access-token or --token.');
         }
         if (normalizedFlags.ui && normalizedFlags.resume) {
             this.error('--ui cannot be used with --resume.');
         }
-        if (!normalizedFlags.ui &&
-            (normalizedFlags['ui-host'] !== undefined || normalizedFlags['ui-port'] !== undefined)) {
+        if (!normalizedFlags.ui && (normalizedFlags['ui-host'] !== undefined || normalizedFlags['ui-port'] !== undefined)) {
             this.error('--ui-host and --ui-port require --ui.');
         }
         if (normalizedFlags.resume) {
@@ -454,8 +470,17 @@ Prompt modes:
             command: this,
         });
         const normalizedResults = {
+            ...pickKeys(presetValues, [
+                'authType',
+                'accessToken',
+                'dbSchema',
+                'dbTablePrefix',
+                'dbUnderscored',
+                'skipAuth',
+                'username',
+                'password',
+            ]),
             ...results,
-            ...pickKeys(presetValues, ['dbSchema', 'dbTablePrefix', 'dbUnderscored', 'skipAuth']),
         };
         const hasNocobase = normalizedResults.hasNocobase === 'yes';
         const existingEnv = !hasNocobase
@@ -510,9 +535,7 @@ Prompt modes:
             }
         }
         const downloadSeed = { ...presetValues };
-        if (flags.yes
-            && !Object.prototype.hasOwnProperty.call(downloadSeed, 'source')
-            && downloadSeed.fetchSource !== false) {
+        if (flags.yes && !Object.prototype.hasOwnProperty.call(downloadSeed, 'source')) {
             downloadSeed.source = 'docker';
         }
         const dbInitial = await Install.buildDbPromptInitialValues({
@@ -544,6 +567,8 @@ Prompt modes:
                 catalog: {
                     apiBaseUrl: c.apiBaseUrl,
                     authType: c.authType,
+                    username: c.username,
+                    password: c.password,
                     accessToken: c.accessToken,
                 },
             },
@@ -555,7 +580,7 @@ Prompt modes:
                     appRootPath: c.appRootPath,
                     appPort: c.appPort,
                     storagePath: c.storagePath,
-                    fetchSource: c.fetchSource,
+                    skipDownload: c.skipDownload,
                 },
             },
             {
@@ -589,6 +614,9 @@ Prompt modes:
                     dbDatabase: c.dbDatabase,
                     dbUser: c.dbUser,
                     dbPassword: c.dbPassword,
+                    dbSchema: c.dbSchema,
+                    dbTablePrefix: c.dbTablePrefix,
+                    dbUnderscored: c.dbUnderscored,
                 },
             },
             {
@@ -614,8 +642,7 @@ Prompt modes:
             preset.hasNocobase = 'yes';
             preset.apiBaseUrl = apiBaseUrl;
         }
-        else if (flags['default-api-base-url'] !== undefined
-            && String(flags['default-api-base-url']).trim() !== '') {
+        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() !== '') {
@@ -628,6 +655,12 @@ Prompt modes:
         if (flags['access-token'] !== undefined || flags.token !== undefined) {
             preset.accessToken = accessToken;
         }
+        if (flags.username !== undefined) {
+            preset.username = String(flags.username ?? '').trim();
+        }
+        if (flags.password !== undefined) {
+            preset.password = String(flags.password ?? '');
+        }
         if (flags.lang !== undefined && String(flags.lang).trim() !== '') {
             preset.lang = String(flags.lang).trim();
         }
@@ -683,8 +716,15 @@ Prompt modes:
         if (argvHasToken(argv, ['--db-underscored', '--no-db-underscored'])) {
             preset.dbUnderscored = Boolean(flags['db-underscored']);
         }
-        if (argvHasToken(argv, ['--fetch-source'])) {
-            preset.fetchSource = Boolean(flags['fetch-source']);
+        if (argvHasToken(argv, ['--skip-download'])) {
+            preset.skipDownload = Boolean(flags['skip-download']);
+            if (preset.skipDownload) {
+                preset.dockerSave = false;
+                preset.replace = false;
+                preset.devDependencies = false;
+                preset.build = false;
+                preset.buildDts = false;
+            }
         }
         if (flags.source !== undefined && String(flags.source).trim() !== '') {
             preset.source = String(flags.source).trim();
@@ -747,19 +787,16 @@ Prompt modes:
         }
         try {
             logInitStage('Syncing agent skills');
-            const status = await inspectSkillsStatus();
-            if (!status.installed) {
-                printVerbose('Installing NocoBase agent skills (nb skills install)');
-                await installNocoBaseSkills();
-                printInfo('Agent skills ready.');
-                return;
-            }
-            printVerbose('Updating NocoBase agent skills (nb skills update)');
-            await updateNocoBaseSkills();
+            await installNocoBaseSkills();
             printInfo('Agent skills ready.');
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
+            if (isNpmRegistryUnavailable(error)) {
+                printWarning(translateCli('commands.init.messages.skillsSyncRegistryUnavailable'));
+                printVerbose(`Skipped agent skills sync because the npm registry was unavailable: ${message}`);
+                return;
+            }
             this.error(pc.red(`Skills sync failed: ${message}`));
             this.exit(1);
         }
@@ -786,7 +823,9 @@ Prompt modes:
         const dbTablePrefix = String(results.dbTablePrefix ?? '').trim();
         const apiBaseUrl = String(results.apiBaseUrl ?? '').trim();
         const authType = String(results.authType ?? '').trim() || 'oauth';
+        const authUsername = authType === 'basic' ? String(results.username ?? results.rootUsername ?? '').trim() : '';
         const accessToken = String(results.accessToken ?? '');
+        const skipDownload = results.skipDownload === true;
         const builtinDb = explicitDbHostFlag(flags)
             ? false
             : results.builtinDb === undefined
@@ -802,7 +841,8 @@ Prompt modes:
                         : {}),
             ...(apiBaseUrl ? { apiBaseUrl } : appPort ? { apiBaseUrl: `http://127.0.0.1:${appPort}/api` } : {}),
             ...(authType ? { authType } : {}),
-            ...(authType === 'token' && accessToken ? { accessToken } : {}),
+            ...(authUsername ? { authUsername } : {}),
+            ...((authType === 'token' || authType === 'basic') && accessToken ? { accessToken } : {}),
             ...(source ? { source } : {}),
             ...(version ? { downloadVersion: version } : {}),
             ...(dockerRegistry ? { dockerRegistry } : {}),
@@ -812,9 +852,11 @@ Prompt modes:
             ...(appRootPath ? { appRootPath } : {}),
             ...(storagePath ? { storagePath } : {}),
             ...(appPort ? { appPort } : {}),
-            ...(results.devDependencies !== undefined ? { devDependencies: Boolean(results.devDependencies) } : {}),
-            ...(results.build !== undefined ? { build: Boolean(results.build) } : {}),
-            ...(results.buildDts !== undefined ? { buildDts: Boolean(results.buildDts) } : {}),
+            ...(!skipDownload && results.devDependencies !== undefined
+                ? { devDependencies: Boolean(results.devDependencies) }
+                : {}),
+            ...(!skipDownload && results.build !== undefined ? { build: Boolean(results.build) } : {}),
+            ...(!skipDownload && results.buildDts !== undefined ? { buildDts: Boolean(results.buildDts) } : {}),
             ...(builtinDb !== undefined ? { builtinDb } : {}),
             ...(dbDialect ? { dbDialect } : {}),
             ...(builtinDbImage || builtinDb === false ? { builtinDbImage: builtinDbImage || undefined } : {}),
@@ -834,12 +876,20 @@ Prompt modes:
         argv.push('--api-base-url', String(results.apiBaseUrl ?? DEFAULT_INIT_API_BASE_URL));
         argv.push('--auth-type', String(results.authType ?? 'oauth'));
         const accessToken = String(results.accessToken ?? '');
+        const username = String(results.username ?? '').trim();
+        const password = String(results.password ?? '');
         if (results.skipAuth === true) {
             argv.push('--skip-auth');
         }
         else if (results.authType === 'token' && accessToken) {
             argv.push('--access-token', accessToken);
         }
+        if (results.authType === 'basic' && username) {
+            argv.push('--username', username);
+        }
+        if (results.authType === 'basic' && results.skipAuth !== true && password) {
+            argv.push('--password', password);
+        }
         return argv;
     }
     buildInstallArgv(results, flags, options) {
@@ -851,15 +901,18 @@ 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 skipDownload = Boolean(flags['skip-download']) || results.skipDownload === true;
         const hasNocobase = String(results.hasNocobase ?? '').trim() === 'yes';
         const apiBaseUrl = String(results.apiBaseUrl ?? '').trim();
         const authType = String(results.authType ?? '').trim();
         const accessToken = String(results.accessToken ?? '');
+        const username = String(results.username ?? flags.username ?? '').trim();
+        const password = String(results.password ?? flags.password ?? '');
         argv.push('--env', envName);
         if (options?.resume) {
             argv.push('--resume');
         }
-        if (Boolean(flags.verbose)) {
+        if (flags.verbose) {
             argv.push('--verbose');
         }
         if (hasNocobase && apiBaseUrl) {
@@ -874,6 +927,12 @@ Prompt modes:
         if (authType === 'token' && accessToken) {
             argv.push('--access-token', accessToken);
         }
+        if (authType === 'basic' && username) {
+            argv.push('--username', username);
+        }
+        if (authType === 'basic' && password) {
+            argv.push('--password', password);
+        }
         const lang = String(results.lang ?? '').trim();
         if (lang) {
             argv.push('--lang', lang);
@@ -890,54 +949,56 @@ Prompt modes:
         if (storagePath) {
             argv.push('--storage-path', storagePath);
         }
-        if (Boolean(flags.force)) {
+        if (flags.force) {
             argv.push('--force');
         }
-        if (Boolean(results.fetchSource)) {
-            argv.push('--fetch-source');
-            if (source) {
-                argv.push('--source', source);
-            }
-            const version = resolveInitDownloadVersion(results);
-            if (version) {
-                argv.push('--version', version);
-            }
+        if (source) {
+            argv.push('--source', source);
+        }
+        const version = resolveInitDownloadVersion(results);
+        if (version) {
+            argv.push('--version', version);
+        }
+        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 (skipDownload) {
+            argv.push('--skip-download');
+        }
+        else {
             const outputDir = String(results.outputDir ?? '').trim();
             if (outputDir) {
                 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.replace)) {
+            if (results.replace) {
                 argv.push('--replace');
             }
-            if (Boolean(results.devDependencies)) {
+            if (results.devDependencies) {
                 argv.push('--dev-dependencies');
             }
-            if (Boolean(results.dockerSave)) {
+            if (results.dockerSave) {
                 argv.push('--docker-save');
             }
-            if (results.build !== undefined && !Boolean(results.build)) {
+            if (results.build !== undefined && !results.build) {
                 argv.push('--no-build');
             }
             else if (argvHasToken(processArgv, ['--build', '--no-build']) && flags.build === false) {
                 argv.push('--no-build');
             }
-            if (Boolean(results.buildDts)) {
+            if (results.buildDts) {
                 argv.push('--build-dts');
             }
         }
@@ -965,9 +1026,9 @@ Prompt modes:
         const dbPortWasProvided = argvHasToken(processArgv, ['--db-port']);
         const dockerBuiltinDbPortIsHidden = builtinDb && source === 'docker';
         const dbDefaultPort = defaultDbPortForDialect(dbDialect);
-        if (dbPort
-            && (!dockerBuiltinDbPortIsHidden || dbPortWasProvided)
-            && (!flags.yes || dbPortWasProvided || dbPort !== dbDefaultPort)) {
+        if (dbPort &&
+            (!dockerBuiltinDbPortIsHidden || dbPortWasProvided) &&
+            (!flags.yes || dbPortWasProvided || dbPort !== dbDefaultPort)) {
             argv.push('--db-port', dbPort);
         }
         const dbDatabase = String(results.dbDatabase ?? '').trim();
@@ -991,7 +1052,7 @@ Prompt modes:
             argv.push('--db-table-prefix', dbTablePrefix);
         }
         if (results.dbUnderscored !== undefined) {
-            argv.push(Boolean(results.dbUnderscored) ? '--db-underscored' : '--no-db-underscored');
+            argv.push(results.dbUnderscored ? '--db-underscored' : '--no-db-underscored');
         }
         const rootUsername = String(results.rootUsername ?? '').trim();
         if (rootUsername) {
@@ -1013,50 +1074,54 @@ Prompt modes:
     }
     buildManagedInstallResumeCommand(results, flags) {
         const argv = ['nb', 'init'];
-        if (Boolean(flags.yes)) {
+        if (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 source = String(results.source ?? '').trim();
+        const skipDownload = Boolean(flags['skip-download']) || results.skipDownload === true;
+        if (source) {
+            argv.push('--source', source);
+        }
+        const version = resolveInitDownloadVersion(results);
+        if (version) {
+            argv.push('--version', version);
+        }
+        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 (skipDownload) {
+            argv.push('--skip-download');
+        }
+        else {
             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)) {
+            if (results.devDependencies) {
                 argv.push('--dev-dependencies');
             }
-            if (Boolean(results.dockerSave)) {
+            if (results.dockerSave) {
                 argv.push('--docker-save');
             }
-            if (results.build !== undefined && !Boolean(results.build)) {
+            if (results.build !== undefined && !results.build) {
                 argv.push('--no-build');
             }
-            if (Boolean(results.buildDts)) {
+            if (results.buildDts) {
                 argv.push('--build-dts');
             }
         }
@@ -1065,11 +1130,7 @@ Prompt modes:
     }
     formatManagedInstallFailureMessage(message, results, flags) {
         const command = this.buildManagedInstallResumeCommand(results, flags);
-        return [
-            message,
-            '',
-            translateCli('commands.init.messages.resumeAfterInstallFailure', { command }),
-        ].join('\n');
+        return [message, '', translateCli('commands.init.messages.resumeAfterInstallFailure', { command })].join('\n');
     }
     buildResumeInstallArgv(flags) {
         const preset = this.buildPresetValuesFromFlags(flags);
@@ -1080,10 +1141,9 @@ Prompt modes:
             preset.rootPassword ??= yesInitialValue(Install.rootUserPrompts.rootPassword, 'admin123');
             preset.rootNickname ??= yesInitialValue(Install.rootUserPrompts.rootNickname, 'Super Admin');
         }
-        if (hasDownloadOverride(flags)) {
-            preset.fetchSource ??= true;
+        if (!flags['skip-download']) {
+            preset.replace ??= true;
         }
-        preset.replace ??= true;
         return this.buildInstallArgv(preset, flags, {
             nonInteractive: Boolean(flags.yes),
             resume: true,