@nocobase/cli 2.1.0-alpha.46 → 2.1.0-alpha.47

package/dist/commands/init.js

@@ -16,6 +16,8 @@ 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 { resolveDefaultApiHost, resolveDefaultUiHost } from '../lib/cli-config.js';
+import { areConfiguredPathsEquivalent, deriveConfiguredSourcePath, deriveConfiguredStoragePath, inferConfiguredAppPathFromLegacyConfig, } from '../lib/env-paths.js';
 import { runPromptCatalogWebUI } from "../lib/prompt-web-ui.js";
 import { validateApiBaseUrl, validateEnvKey } from "../lib/prompt-validators.js";
 import { installNocoBaseSkills, isNpmRegistryUnavailable } from '../lib/skills-manager.js';
@@ -27,6 +29,7 @@ import Install, { defaultDbPortForDialect } from "./install.js";
 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 INIT_SETUP_MODES = ['install-new', 'manage-local', 'connect-remote'];
 const INIT_ENV_ADD_FLAG_NAMES = [
     'locale',
     'default-api-base-url',
@@ -48,14 +51,45 @@ function withExtraHidden(def, extraHidden) {
         hidden: (values) => extraHidden(values) || (def.hidden?.(values) ?? false),
     };
 }
-function existingAppOnly(def) {
-    return withExtraHidden(def, (values) => values.hasNocobase !== 'yes');
+function normalizeInitSetupMode(value) {
+    const mode = String(value ?? '').trim();
+    if (mode === 'manage-local' || mode === 'connect-remote' || mode === 'install-new') {
+        return mode;
+    }
+    if (mode === 'yes') {
+        return 'connect-remote';
+    }
+    if (mode === 'no') {
+        return 'install-new';
+    }
+    return 'install-new';
+}
+function resolveInitSetupMode(values) {
+    return normalizeInitSetupMode(values.setupMode ?? values.hasNocobase);
+}
+function isRemoteSetupMode(values) {
+    return resolveInitSetupMode(values) === 'connect-remote';
+}
+function isInstallNewSetupMode(values) {
+    return resolveInitSetupMode(values) === 'install-new';
 }
-function newInstallOnly(def) {
-    return withExtraHidden(def, (values) => values.hasNocobase !== 'no');
+function isInstallLikeSetupMode(values) {
+    return !isRemoteSetupMode(values);
 }
-function newInstallDownloadExecutionOnly(def) {
-    return withExtraHidden(def, (values) => values.hasNocobase !== 'no' || values.skipDownload === true);
+function remoteConnectionOnly(def) {
+    return withExtraHidden(def, (values) => !isRemoteSetupMode(values));
+}
+function installLikeOnly(def) {
+    return withExtraHidden(def, (values) => !isInstallLikeSetupMode(values));
+}
+function installNewOnly(def) {
+    return withExtraHidden(def, (values) => !isInstallNewSetupMode(values));
+}
+function installConnectionOnly(def) {
+    return withExtraHidden(def, (values) => !isInstallNewSetupMode(values));
+}
+function installLikeDownloadExecutionOnly(def) {
+    return withExtraHidden(def, (values) => !isInstallLikeSetupMode(values) || values.skipDownload === true);
 }
 function argvHasToken(argv, tokens) {
     return tokens.some((token) => argv.includes(token));
@@ -85,6 +119,26 @@ function explicitApiBaseUrlFlag(flags) {
 function explicitDbHostFlag(flags) {
     return String(flags['db-host'] ?? '').trim();
 }
+function explicitSetupModeFlag(flags) {
+    const mode = String(flags['setup-mode'] ?? '').trim();
+    return mode ? normalizeInitSetupMode(mode) : undefined;
+}
+function applyLegacyHasNocobaseAlias(values) {
+    if (!Object.prototype.hasOwnProperty.call(values, 'setupMode') &&
+        !Object.prototype.hasOwnProperty.call(values, 'hasNocobase')) {
+        return;
+    }
+    const setupMode = resolveInitSetupMode(values);
+    if (setupMode === 'connect-remote') {
+        values.hasNocobase = 'yes';
+        return;
+    }
+    if (setupMode === 'install-new') {
+        values.hasNocobase = 'no';
+        return;
+    }
+    delete values.hasNocobase;
+}
 function optionalInitString(value) {
     const text = String(value ?? '').trim();
     return text || undefined;
@@ -95,6 +149,39 @@ function resolveManagedAppKey(value) {
 function resolveManagedTimeZone(value) {
     return optionalInitString(value) ?? (Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC');
 }
+function normalizeConnectionString(value) {
+    return String(value ?? '').trim();
+}
+function deriveInstallConnectionApiBaseUrl(values, defaultApiHost = '127.0.0.1') {
+    const appPort = normalizeConnectionString(values.appPort);
+    return appPort ? `http://${defaultApiHost}:${appPort}/api` : DEFAULT_INIT_API_BASE_URL;
+}
+function createInstallConnectionApiBaseUrlPrompt(defaultApiHost) {
+    return installConnectionOnly({
+        type: 'text',
+        message: initText('prompts.apiBaseUrl.message'),
+        placeholder: initText('prompts.apiBaseUrl.placeholder'),
+        required: true,
+        initialValue: (values) => deriveInstallConnectionApiBaseUrl(values, defaultApiHost),
+    });
+}
+const installConnectionAuthTypePrompt = installConnectionOnly({
+    ...EnvAdd.prompts.authType,
+});
+const installConnectionUsernamePrompt = installConnectionOnly({
+    ...Install.rootUserPrompts.rootUsername,
+    hidden: () => true,
+    initialValue: (values) => normalizeConnectionString(values.rootUsername),
+});
+const installConnectionPasswordPrompt = installConnectionOnly({
+    ...Install.rootUserPrompts.rootPassword,
+    hidden: () => true,
+    initialValue: (values) => String(values.rootPassword ?? ''),
+});
+const installConnectionAccessTokenPrompt = installConnectionOnly({
+    ...EnvAdd.prompts.accessToken,
+    hidden: (values) => values.installAuthType !== 'token' || values.skipAuth === true,
+});
 function shouldAllowExistingInitEnv() {
     return argvHasToken(process.argv.slice(2), ['--force', '-f']);
 }
@@ -161,10 +248,11 @@ export default class Init extends Command {
     static summary = 'Set up NocoBase so coding agents can connect and work with it';
     static description = `Set up NocoBase for coding agents in the current workspace.
 
-\`nb init\` prepares a NocoBase environment that coding agents can use. It supports two setup paths:
+\`nb init\` prepares a NocoBase environment that coding agents can use. It supports three setup paths:
 
-- Connect an existing NocoBase app and save it as a CLI env.
 - Install a new NocoBase app, then save it as a CLI env.
+- Take over managing an app that already exists on this machine by reusing its database.
+- Connect a remote NocoBase app and save it as a CLI env.
 
 It can also install NocoBase AI coding skills (\`nocobase/skills\`) so agents get the project-specific workflow guidance.
 
@@ -173,7 +261,7 @@ If setup was interrupted earlier, use \`--resume\` with an existing env name to
 Prompt modes:
 - Default: guided prompts in the terminal.
 - \`--ui\`: open the same setup flow in a local browser form.
-- \`-y\`, \`--yes\`: skip prompts. In this mode \`--env <envName>\` is required, and init creates a new local NocoBase app with safe defaults.
+- \`-y\`, \`--yes\`: skip prompts. In this mode \`--env <envName>\` is required, and init uses flags plus safe defaults for the selected setup mode.
 
 \`--ui\` cannot be combined with \`--yes\`.`;
     static examples = [
@@ -184,8 +272,10 @@ Prompt modes:
         '<%= config.bin %> <%= command.id %> --env app1 --yes',
         '<%= config.bin %> <%= command.id %> --env app1 --resume',
         '<%= config.bin %> <%= command.id %> --env app1 --yes --source docker --version alpha',
+        '<%= config.bin %> <%= command.id %> --env app1 --yes --setup-mode manage-local --source npm --version beta',
         '<%= config.bin %> <%= command.id %> --env app1 --yes --source npm --version alpha --app-port 13080',
         '<%= config.bin %> <%= command.id %> --env app1 --yes --source git --version fix/cli-v2',
+        '<%= config.bin %> <%= command.id %> --env staging --yes --setup-mode connect-remote --api-base-url https://demo.example.com/api',
         '<%= config.bin %> <%= command.id %> --ui --ui-port 3000',
     ];
     static prompts = {
@@ -216,53 +306,61 @@ Prompt modes:
             required: true,
             validate: validateInitAppName,
         },
-        hasNocobase: {
+        setupMode: {
             type: 'select',
             variant: 'radio',
-            message: initText('prompts.hasNocobase.message'),
+            message: initText('prompts.setupMode.message'),
             options: [
                 {
-                    value: 'no',
-                    label: initText('prompts.hasNocobase.noLabel'),
+                    value: 'install-new',
+                    label: initText('prompts.setupMode.installNewLabel'),
+                    hint: initText('prompts.setupMode.installNewHint'),
                 },
                 {
-                    value: 'yes',
-                    label: initText('prompts.hasNocobase.yesLabel'),
+                    value: 'connect-remote',
+                    label: initText('prompts.setupMode.connectRemoteLabel'),
+                    hint: initText('prompts.setupMode.connectRemoteHint'),
+                },
+                {
+                    value: 'manage-local',
+                    label: initText('prompts.setupMode.manageLocalLabel'),
+                    hint: initText('prompts.setupMode.manageLocalHint'),
+                    disabled: true,
                 },
             ],
-            initialValue: 'no',
-            yesInitialValue: 'no',
+            initialValue: 'install-new',
+            yesInitialValue: 'install-new',
             required: true,
         },
-        apiBaseUrl: existingAppOnly({
+        apiBaseUrl: remoteConnectionOnly({
             type: 'text',
             message: initText('prompts.apiBaseUrl.message'),
             placeholder: initText('prompts.apiBaseUrl.placeholder'),
             required: true,
             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),
-        skipDownload: newInstallOnly({
+        authType: remoteConnectionOnly(EnvAdd.prompts.authType),
+        username: remoteConnectionOnly(EnvAdd.prompts.username),
+        password: remoteConnectionOnly(EnvAdd.prompts.password),
+        accessToken: remoteConnectionOnly(EnvAdd.prompts.accessToken),
+        lang: installLikeOnly(Install.appPrompts.lang),
+        appPath: installLikeOnly(Install.appPrompts.appPath),
+        appPort: installLikeOnly(Install.appPrompts.appPort),
+        appPublicPath: installLikeOnly(Install.appPrompts.appPublicPath),
+        skipDownload: installNewOnly({
             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({
+        source: installLikeOnly(Download.prompts.source),
+        version: installLikeOnly(Download.prompts.version),
+        otherVersion: installLikeOnly(Download.prompts.otherVersion),
+        dockerRegistry: installLikeOnly(Download.prompts.dockerRegistry),
+        dockerPlatform: installLikeOnly(Download.prompts.dockerPlatform),
+        dockerSave: installLikeDownloadExecutionOnly(Download.prompts.dockerSave),
+        gitUrl: installLikeOnly(Download.prompts.gitUrl),
+        outputDir: installLikeDownloadExecutionOnly({
             ...DOWNLOAD_OUTPUT_DIR_PROMPT,
             hidden: (values) => {
                 const source = String(values.source ?? '').trim();
@@ -274,7 +372,8 @@ Prompt modes:
             initialValue: (values) => {
                 const source = String(values.source ?? '').trim();
                 if (source === 'npm' || source === 'git') {
-                    const appRootPath = String(values.appRootPath ?? '').trim();
+                    const appPath = String(values.appPath ?? inferConfiguredAppPathFromLegacyConfig(values) ?? '').trim();
+                    const appRootPath = String(values.appRootPath ?? '').trim() || (appPath ? deriveConfiguredSourcePath(appPath) : '');
                     if (appRootPath) {
                         return appRootPath;
                     }
@@ -283,30 +382,35 @@ Prompt modes:
                 return typeof initialValue === 'function' ? initialValue(values) : String(initialValue ?? '');
             },
         }),
-        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),
-        dbHost: newInstallOnly(Install.dbPrompts.dbHost),
-        dbPort: newInstallOnly(Install.dbPrompts.dbPort),
-        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),
+        npmRegistry: installLikeOnly(Download.prompts.npmRegistry),
+        replace: installLikeDownloadExecutionOnly(Download.prompts.replace),
+        devDependencies: installLikeDownloadExecutionOnly(Download.prompts.devDependencies),
+        build: installLikeDownloadExecutionOnly(Download.prompts.build),
+        buildDts: installLikeDownloadExecutionOnly(Download.prompts.buildDts),
+        dbDialect: installLikeOnly(Install.dbPrompts.dbDialect),
+        builtinDb: installLikeOnly(Install.dbPrompts.builtinDb),
+        builtinDbImage: installLikeOnly(Install.dbPrompts.builtinDbImage),
+        dbHost: installLikeOnly(Install.dbPrompts.dbHost),
+        dbPort: installLikeOnly(Install.dbPrompts.dbPort),
+        dbDatabase: installLikeOnly(Install.dbPrompts.dbDatabase),
+        dbUser: installLikeOnly(Install.dbPrompts.dbUser),
+        dbPassword: installLikeOnly(Install.dbPrompts.dbPassword),
+        dbSchema: installLikeOnly(Install.dbPrompts.dbSchema),
+        dbTablePrefix: installLikeOnly(Install.dbPrompts.dbTablePrefix),
+        dbUnderscored: installLikeOnly(Install.dbPrompts.dbUnderscored),
+        rootUsername: installNewOnly(Install.rootUserPrompts.rootUsername),
+        rootEmail: installNewOnly(Install.rootUserPrompts.rootEmail),
+        rootPassword: installNewOnly(Install.rootUserPrompts.rootPassword),
+        rootNickname: installNewOnly(Install.rootUserPrompts.rootNickname),
+        installAuthType: installConnectionAuthTypePrompt,
+        installUsername: installConnectionUsernamePrompt,
+        installPassword: installConnectionPasswordPrompt,
+        installAccessToken: installConnectionAccessTokenPrompt,
     };
-    buildPromptCatalog(flags) {
+    buildPromptCatalog(flags, options) {
         const prompts = {
             ...Init.prompts,
+            installApiBaseUrl: createInstallConnectionApiBaseUrlPrompt(options.defaultApiHost),
         };
         if (flags['skip-auth']) {
             const accessTokenPrompt = {
@@ -321,9 +425,24 @@ Prompt modes:
                 ...EnvAdd.prompts.password,
                 hidden: () => true,
             };
-            prompts.username = existingAppOnly(usernamePrompt);
-            prompts.password = existingAppOnly(passwordPrompt);
-            prompts.accessToken = existingAppOnly(accessTokenPrompt);
+            const installAccessTokenPrompt = {
+                ...installConnectionAccessTokenPrompt,
+                hidden: () => true,
+            };
+            const installUsernamePrompt = {
+                ...installConnectionUsernamePrompt,
+                hidden: () => true,
+            };
+            const installPasswordPrompt = {
+                ...installConnectionPasswordPrompt,
+                hidden: () => true,
+            };
+            prompts.username = remoteConnectionOnly(usernamePrompt);
+            prompts.password = remoteConnectionOnly(passwordPrompt);
+            prompts.accessToken = remoteConnectionOnly(accessTokenPrompt);
+            prompts.installUsername = installUsernamePrompt;
+            prompts.installPassword = installPasswordPrompt;
+            prompts.installAccessToken = installAccessTokenPrompt;
         }
         return prompts;
     }
@@ -331,13 +450,17 @@ Prompt modes:
     static flags = {
         yes: Flags.boolean({
             char: 'y',
-            description: 'Skip prompts and create a new local NocoBase app. Requires an env name.',
+            description: 'Skip prompts and use flags plus defaults for the selected setup mode. Requires an env name.',
             default: false,
         }),
         env: Flags.string({
             char: 'e',
             description: 'Env name for this setup. Required with --yes and --resume',
         }),
+        'setup-mode': Flags.string({
+            description: 'Setup mode: install a new app, manage a local app by reusing its database, or connect a remote app',
+            options: [...INIT_SETUP_MODES],
+        }),
         ui: Flags.boolean({
             description: 'Open the guided setup flow in a local browser form (not valid with --yes)',
             default: false,
@@ -442,7 +565,9 @@ Prompt modes:
             }
         }
         const dynamicInitialValues = await Init.buildDynamicInitialValuesForInstall(normalizedFlags, presetValues);
-        const promptCatalog = this.buildPromptCatalog(normalizedFlags);
+        const defaultUiHost = await resolveDefaultUiHost();
+        const defaultApiHost = await resolveDefaultApiHost();
+        const promptCatalog = this.buildPromptCatalog(normalizedFlags, { defaultApiHost });
         if (useBrowserUi) {
             presetValues = await runPromptCatalogWebUI({
                 stages: Init.buildWebUiStages(promptCatalog),
@@ -450,7 +575,7 @@ Prompt modes:
                     ...dynamicInitialValues,
                     ...presetValues,
                 },
-                host: normalizedFlags['ui-host']?.trim() || '127.0.0.1',
+                host: normalizedFlags['ui-host']?.trim() || defaultUiHost,
                 port: normalizedFlags['ui-port'] ?? 0,
                 pageTitle: initText('webUi.pageTitle'),
                 documentHeading: initText('webUi.documentHeading'),
@@ -465,7 +590,12 @@ Prompt modes:
             });
         }
         const results = await runPromptCatalog(promptCatalog, {
-            initialValues: dynamicInitialValues,
+            initialValues: {
+                ...dynamicInitialValues,
+                ...(presetValues.setupMode === undefined && presetValues.hasNocobase !== undefined
+                    ? { setupMode: normalizeInitSetupMode(presetValues.hasNocobase) }
+                    : {}),
+            },
             values: presetValues,
             yes: normalizedFlags.yes || useBrowserUi || !interactive,
             hooks: {
@@ -480,21 +610,28 @@ Prompt modes:
             },
             command: this,
         });
-        const normalizedResults = {
+        const normalizedResults = this.normalizeInitResults({
             ...pickKeys(presetValues, [
+                'defaultApiHost',
                 'authType',
                 'accessToken',
                 'dbSchema',
                 'dbTablePrefix',
                 'dbUnderscored',
+                'installApiBaseUrl',
+                'installAuthType',
+                'installAccessToken',
+                'installUsername',
+                'installPassword',
                 'skipAuth',
                 'username',
                 'password',
             ]),
+            defaultApiHost,
             ...results,
-        };
-        const hasNocobase = normalizedResults.hasNocobase === 'yes';
-        const existingEnv = !hasNocobase
+        });
+        const setupMode = resolveInitSetupMode(normalizedResults);
+        const existingEnv = isInstallLikeSetupMode(normalizedResults)
             ? await getEnv(String(normalizedResults.appName ?? '').trim(), { scope: resolveDefaultConfigScope() })
             : undefined;
         if (existingEnv && Boolean(normalizedFlags.force)) {
@@ -506,7 +643,7 @@ Prompt modes:
         let managedInstallResults;
         try {
             // oclif explicit registry keys use `:` (e.g. `env:add`); users still type `nb env add`.
-            if (hasNocobase) {
+            if (setupMode === 'connect-remote') {
                 logInitStage('Connecting to the env');
                 printVerbose('Running nb env add');
                 await this.config.runCommand('env:add', this.buildEnvAddArgv(normalizedResults));
@@ -536,6 +673,7 @@ Prompt modes:
                 envName: String(presetValues.appName ?? '').trim(),
                 flags: {
                     ...flags,
+                    'app-path': flags['app-path'] ?? '',
                     'app-root-path': flags['app-root-path'] ?? '',
                     'storage-path': flags['storage-path'] ?? '',
                 },
@@ -569,7 +707,7 @@ Prompt modes:
                 sectionDescription: initText('webUi.gettingStarted.description'),
                 catalog: {
                     appName: c.appName,
-                    hasNocobase: c.hasNocobase,
+                    setupMode: c.setupMode,
                 },
             },
             {
@@ -588,9 +726,9 @@ Prompt modes:
                 sectionDescription: initText('webUi.createNewApp.description'),
                 catalog: {
                     lang: c.lang,
-                    appRootPath: c.appRootPath,
+                    appPath: c.appPath,
                     appPort: c.appPort,
-                    storagePath: c.storagePath,
+                    appPublicPath: c.appPublicPath,
                     skipDownload: c.skipDownload,
                 },
             },
@@ -640,24 +778,42 @@ Prompt modes:
                     rootNickname: c.rootNickname,
                 },
             },
+            {
+                sectionTitle: initText('webUi.connectExistingApp.title'),
+                sectionDescription: initText('webUi.connectExistingApp.description'),
+                catalog: {
+                    installApiBaseUrl: c.installApiBaseUrl,
+                    installAuthType: c.installAuthType,
+                    installAccessToken: c.installAccessToken,
+                },
+            },
         ];
     }
     buildPresetValuesFromFlags(flags) {
         const preset = {};
         const argv = process.argv.slice(2);
+        const setupMode = explicitSetupModeFlag(flags);
         if (flags.env !== undefined && String(flags.env).trim() !== '') {
             preset.appName = String(flags.env).trim();
         }
+        if (setupMode) {
+            preset.setupMode = setupMode;
+        }
         const apiBaseUrl = explicitApiBaseUrlFlag(flags);
         if (apiBaseUrl) {
-            preset.hasNocobase = 'yes';
+            preset.setupMode ??= 'connect-remote';
             preset.apiBaseUrl = apiBaseUrl;
+            preset.installApiBaseUrl = 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();
+            const defaultApiBaseUrl = String(flags['default-api-base-url']).trim();
+            preset.apiBaseUrl = defaultApiBaseUrl;
+            preset.installApiBaseUrl = defaultApiBaseUrl;
         }
         if (flags['auth-type'] !== undefined && String(flags['auth-type']).trim() !== '') {
-            preset.authType = String(flags['auth-type']).trim();
+            const authType = String(flags['auth-type']).trim();
+            preset.authType = authType;
+            preset.installAuthType = authType;
         }
         if (flags['skip-auth']) {
             preset.skipAuth = true;
@@ -665,16 +821,24 @@ Prompt modes:
         const accessToken = String(flags['access-token'] ?? flags.token ?? '');
         if (flags['access-token'] !== undefined || flags.token !== undefined) {
             preset.accessToken = accessToken;
+            preset.installAccessToken = accessToken;
         }
         if (flags.username !== undefined) {
-            preset.username = String(flags.username ?? '').trim();
+            const username = String(flags.username ?? '').trim();
+            preset.username = username;
+            preset.installUsername = username;
         }
         if (flags.password !== undefined) {
-            preset.password = String(flags.password ?? '');
+            const password = String(flags.password ?? '');
+            preset.password = password;
+            preset.installPassword = password;
         }
         if (flags.lang !== undefined && String(flags.lang).trim() !== '') {
             preset.lang = String(flags.lang).trim();
         }
+        if (flags['app-path'] !== undefined && String(flags['app-path']).trim() !== '') {
+            preset.appPath = String(flags['app-path']).trim();
+        }
         if (flags['app-root-path'] !== undefined && String(flags['app-root-path']).trim() !== '') {
             preset.appRootPath = String(flags['app-root-path']).trim();
         }
@@ -684,6 +848,9 @@ Prompt modes:
         if (flags['storage-path'] !== undefined && String(flags['storage-path']).trim() !== '') {
             preset.storagePath = String(flags['storage-path']).trim();
         }
+        if (flags['app-public-path'] !== undefined && String(flags['app-public-path']).trim() !== '') {
+            preset.appPublicPath = String(flags['app-public-path']).trim();
+        }
         if (flags['root-username'] !== undefined) {
             preset.rootUsername = String(flags['root-username'] ?? '').trim();
         }
@@ -783,9 +950,13 @@ Prompt modes:
         if (explicitDbHostFlag(flags)) {
             preset.builtinDb = false;
         }
-        if (!preset.hasNocobase && hasDownloadOverride(flags)) {
-            preset.hasNocobase = 'no';
+        if (!preset.setupMode && hasDownloadOverride(flags)) {
+            preset.setupMode = 'install-new';
         }
+        if (preset.setupMode === 'manage-local') {
+            preset.skipDownload = false;
+        }
+        applyLegacyHasNocobaseAlias(preset);
         return preset;
     }
     hasAgentsDirInCwd() {
@@ -816,14 +987,23 @@ Prompt modes:
         const envName = String(results.appName ?? DEFAULT_INIT_APP_NAME).trim() || DEFAULT_INIT_APP_NAME;
         const existingEnv = await getEnv(envName, { scope: resolveDefaultConfigScope() });
         const appPort = String(results.appPort ?? '').trim();
+        const appPublicPath = String(results.appPublicPath ?? '').trim();
         const source = String(results.source ?? '').trim();
         const version = resolveInitDownloadVersion(results);
         const dockerRegistry = String(results.dockerRegistry ?? '').trim();
         const dockerPlatform = String(results.dockerPlatform ?? '').trim();
         const gitUrl = String(results.gitUrl ?? '').trim();
         const npmRegistry = String(results.npmRegistry ?? '').trim();
+        const appPath = String(results.appPath ?? '').trim() ||
+            inferConfiguredAppPathFromLegacyConfig({
+                appRootPath: results.appRootPath,
+                storagePath: results.storagePath,
+            }) ||
+            '';
         const appRootPath = String(results.appRootPath ?? '').trim();
         const storagePath = String(results.storagePath ?? '').trim();
+        const derivedAppRootPath = appPath ? deriveConfiguredSourcePath(appPath) : '';
+        const derivedStoragePath = appPath ? deriveConfiguredStoragePath(appPath) : '';
         const dbDialect = String(results.dbDialect ?? '').trim();
         const builtinDbImage = String(results.builtinDbImage ?? '').trim();
         const dbHost = String(results.dbHost ?? '').trim();
@@ -850,7 +1030,7 @@ Prompt modes:
         await upsertEnv(envName, {
             ...(source === 'docker'
                 ? { kind: 'docker' }
-                : source || appRootPath
+                : source || appPath || appRootPath
                     ? { kind: 'local' }
                     : appPort
                         ? { kind: 'http' }
@@ -865,9 +1045,11 @@ Prompt modes:
             ...(dockerPlatform ? { dockerPlatform } : {}),
             ...(gitUrl ? { gitUrl } : {}),
             ...(npmRegistry ? { npmRegistry } : {}),
-            ...(appRootPath ? { appRootPath } : {}),
-            ...(storagePath ? { storagePath } : {}),
+            ...(appPath ? { appPath } : {}),
+            ...(appRootPath && !areConfiguredPathsEquivalent(appRootPath, derivedAppRootPath) ? { appRootPath } : {}),
+            ...(storagePath && !areConfiguredPathsEquivalent(storagePath, derivedStoragePath) ? { storagePath } : {}),
             ...(appPort ? { appPort } : {}),
+            ...(appPublicPath ? { appPublicPath } : {}),
             ...(appKey ? { appKey } : {}),
             ...(timeZone ? { timezone: timeZone } : {}),
             ...(!skipDownload && results.devDependencies !== undefined
@@ -919,8 +1101,11 @@ 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 setupMode = resolveInitSetupMode({
+            setupMode: results.setupMode ?? flags['setup-mode'],
+            hasNocobase: results.hasNocobase,
+        });
+        const skipDownload = setupMode === 'manage-local' ? false : Boolean(flags['skip-download']) || results.skipDownload === true;
         const apiBaseUrl = String(results.apiBaseUrl ?? '').trim();
         const authType = String(results.authType ?? '').trim();
         const accessToken = String(results.accessToken ?? '');
@@ -933,7 +1118,7 @@ Prompt modes:
         if (flags.verbose) {
             argv.push('--verbose');
         }
-        if (hasNocobase && apiBaseUrl) {
+        if (setupMode === 'connect-remote' && apiBaseUrl) {
             argv.push('--api-base-url', apiBaseUrl);
         }
         if (authType) {
@@ -955,8 +1140,17 @@ Prompt modes:
         if (lang) {
             argv.push('--lang', lang);
         }
+        const appPath = String(results.appPath ?? '').trim() ||
+            inferConfiguredAppPathFromLegacyConfig({
+                appRootPath: results.appRootPath,
+                storagePath: results.storagePath,
+            }) ||
+            '';
+        if (appPath) {
+            argv.push('--app-path', appPath);
+        }
         const appRootPath = String(results.appRootPath ?? '').trim();
-        if (appRootPath) {
+        if (appRootPath && (!appPath || !areConfiguredPathsEquivalent(appRootPath, deriveConfiguredSourcePath(appPath)))) {
             argv.push('--app-root-path', appRootPath);
         }
         const appPort = String(results.appPort ?? '').trim();
@@ -964,9 +1158,13 @@ Prompt modes:
             argv.push('--app-port', appPort);
         }
         const storagePath = String(results.storagePath ?? '').trim();
-        if (storagePath) {
+        if (storagePath && (!appPath || !areConfiguredPathsEquivalent(storagePath, deriveConfiguredStoragePath(appPath)))) {
             argv.push('--storage-path', storagePath);
         }
+        const appPublicPath = String(results.appPublicPath ?? '').trim();
+        if (appPublicPath) {
+            argv.push('--app-public-path', appPublicPath);
+        }
         if (flags.force) {
             argv.push('--force');
         }
@@ -1072,20 +1270,21 @@ Prompt modes:
         if (results.dbUnderscored !== undefined) {
             argv.push(results.dbUnderscored ? '--db-underscored' : '--no-db-underscored');
         }
+        const includeRootUser = setupMode === 'install-new';
         const rootUsername = String(results.rootUsername ?? '').trim();
-        if (rootUsername) {
+        if (includeRootUser && rootUsername) {
             argv.push('--root-username', rootUsername);
         }
         const rootEmail = String(results.rootEmail ?? '').trim();
-        if (rootEmail) {
+        if (includeRootUser && rootEmail) {
             argv.push('--root-email', rootEmail);
         }
         const rootPassword = String(results.rootPassword ?? '');
-        if (rootPassword) {
+        if (includeRootUser && rootPassword) {
             argv.push('--root-password', rootPassword);
         }
         const rootNickname = String(results.rootNickname ?? '').trim();
-        if (rootNickname) {
+        if (includeRootUser && rootNickname) {
             argv.push('--root-nickname', rootNickname);
         }
         return argv;
@@ -1097,8 +1296,12 @@ Prompt modes:
         }
         const envName = String(results.appName ?? DEFAULT_INIT_APP_NAME).trim() || DEFAULT_INIT_APP_NAME;
         argv.push('--env', envName);
+        const setupMode = resolveInitSetupMode(results);
+        if (setupMode === 'manage-local') {
+            argv.push('--setup-mode', 'manage-local');
+        }
         const source = String(results.source ?? '').trim();
-        const skipDownload = Boolean(flags['skip-download']) || results.skipDownload === true;
+        const skipDownload = setupMode === 'manage-local' ? false : Boolean(flags['skip-download']) || results.skipDownload === true;
         if (source) {
             argv.push('--source', source);
         }
@@ -1127,7 +1330,14 @@ Prompt modes:
         }
         else {
             const outputDir = String(results.outputDir ?? '').trim();
-            if (outputDir && outputDir !== String(results.appRootPath ?? '').trim()) {
+            const appPath = String(results.appPath ?? '').trim() ||
+                inferConfiguredAppPathFromLegacyConfig({
+                    appRootPath: results.appRootPath,
+                    storagePath: results.storagePath,
+                }) ||
+                '';
+            const expectedOutputDir = String(results.appRootPath ?? '').trim() || (appPath ? deriveConfiguredSourcePath(appPath) : '');
+            if (outputDir && outputDir !== expectedOutputDir) {
                 argv.push('--output-dir', outputDir);
             }
             if (results.devDependencies) {
@@ -1152,14 +1362,20 @@ Prompt modes:
     }
     buildResumeInstallArgv(flags) {
         const preset = this.buildPresetValuesFromFlags(flags);
+        const setupMode = resolveInitSetupMode(preset);
         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 (setupMode === 'install-new') {
+                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 (!flags['skip-download']) {
+        if (setupMode === 'manage-local') {
+            preset.skipDownload = false;
+        }
+        else if (!flags['skip-download']) {
             preset.replace ??= true;
         }
         return this.buildInstallArgv(preset, flags, {
@@ -1167,4 +1383,40 @@ Prompt modes:
             resume: true,
         });
     }
+    normalizeInitResults(results) {
+        const normalized = { ...results };
+        const setupMode = resolveInitSetupMode(normalized);
+        const defaultApiHost = normalizeConnectionString(normalized.defaultApiHost) || '127.0.0.1';
+        if (setupMode === 'install-new') {
+            normalized.apiBaseUrl =
+                normalizeConnectionString(normalized.installApiBaseUrl) ||
+                    deriveInstallConnectionApiBaseUrl(normalized, defaultApiHost);
+            normalized.authType = normalizeConnectionString(normalized.installAuthType) || 'oauth';
+            normalized.username =
+                normalized.authType === 'basic'
+                    ? normalizeConnectionString(normalized.installUsername) || normalizeConnectionString(normalized.rootUsername)
+                    : normalizeConnectionString(normalized.installUsername);
+            normalized.password =
+                normalized.authType === 'basic'
+                    ? String(normalized.installPassword ?? '') || String(normalized.rootPassword ?? '')
+                    : String(normalized.installPassword ?? '');
+            normalized.accessToken = String(normalized.installAccessToken ?? '');
+        }
+        normalized.setupMode = setupMode;
+        applyLegacyHasNocobaseAlias(normalized);
+        if (setupMode === 'manage-local') {
+            normalized.skipDownload = false;
+            delete normalized.rootUsername;
+            delete normalized.rootEmail;
+            delete normalized.rootPassword;
+            delete normalized.rootNickname;
+        }
+        delete normalized.installApiBaseUrl;
+        delete normalized.installAuthType;
+        delete normalized.installUsername;
+        delete normalized.installPassword;
+        delete normalized.installAccessToken;
+        delete normalized.defaultApiHost;
+        return normalized;
+    }
 }