@nocobase/cli 2.1.0-beta.44.test.3 → 2.1.0-beta.45

package/bin/run.js

@@ -66,6 +66,10 @@ if (isDev && !process.env._NOCO_CLI_TSX_CHILD) {
 
 const bootstrapPath = isDev ? path.join(root, 'src/lib/bootstrap.ts') : path.join(root, 'dist/lib/bootstrap.js');
 const { ensureRuntimeFromArgv } = await import(pathToFileURL(bootstrapPath).href);
+const commandLogPath = isDev ? path.join(root, 'src/lib/command-log.ts') : path.join(root, 'dist/lib/command-log.js');
+const { finalizeCommandLogSessionSync, initCommandLogSession, installCommandLogWriteHooks } = await import(
+  pathToFileURL(commandLogPath).href
+);
 const startupUpdatePath = isDev
   ? path.join(root, 'src/lib/startup-update.ts')
   : path.join(root, 'dist/lib/startup-update.js');
@@ -73,15 +77,43 @@ const { maybeRunStartupUpdate } = await import(pathToFileURL(startupUpdatePath).
 const cliEntryErrorPath = isDev
   ? path.join(root, 'src/lib/cli-entry-error.ts')
   : path.join(root, 'dist/lib/cli-entry-error.js');
-const { formatCliEntryError } = await import(pathToFileURL(cliEntryErrorPath).href);
+const { appendDiagnosticLogPath, formatCliEntryError } = await import(pathToFileURL(cliEntryErrorPath).href);
 const { flush, run, settings } = await import('@oclif/core');
 
 if (isDev) {
   settings.debug = true;
 }
 
+const cliPackageJson = requireFromCli(path.join(root, 'package.json'));
+const argv = process.argv.slice(2);
+const commandLogSession = await initCommandLogSession({
+  argv,
+  cwd: process.cwd(),
+  sessionId: process.env.NB_SESSION_ID,
+  cliVersion: cliPackageJson?.version,
+  nodeVersion: process.version,
+  platform: process.platform,
+  interactive: Boolean(process.stdin.isTTY && process.stdout.isTTY),
+  verbose: argv.includes('--verbose'),
+});
+const restoreCommandLogHooks = installCommandLogWriteHooks();
+let commandLogFinalized = false;
+
+function finalizeCommandLogOnce(options = {}) {
+  if (commandLogFinalized) {
+    return;
+  }
+
+  commandLogFinalized = true;
+  restoreCommandLogHooks?.();
+  finalizeCommandLogSessionSync(commandLogSession, options);
+}
+
+process.once('exit', (code) => {
+  finalizeCommandLogOnce({ exitCode: code ?? undefined });
+});
+
 try {
-  const argv = process.argv.slice(2);
   const startupUpdate = await maybeRunStartupUpdate(argv);
   if (startupUpdate.kind === 'updated') {
     const result = spawnSync(process.execPath, process.argv.slice(1), {
@@ -100,8 +132,13 @@ try {
   }
   await run(argv, import.meta.url);
   flush();
+  finalizeCommandLogOnce({ exitCode: 0 });
 } catch (error) {
-  const message = formatCliEntryError(error, process.argv.slice(2));
+  const message = appendDiagnosticLogPath(
+    formatCliEntryError(error, process.argv.slice(2)),
+    commandLogSession?.logFile,
+  );
   console.error(pc.red(message));
+  finalizeCommandLogOnce({ exitCode: 1, errorMessage: message });
   process.exit(1);
 }

package/dist/commands/app/destroy.js

@@ -10,9 +10,11 @@ import { Command, Flags } from '@oclif/core';
 import { removeEnv } from '../../lib/auth-store.js';
 import { formatMissingManagedAppEnvMessage, managedAppLifecycleEnvVars, resolveManagedAppRuntime, runLocalNocoBaseCommand, } from '../../lib/app-runtime.js';
 import { hasExplicitEnvSelection } from '../../lib/env-guard.js';
+import { resolveEnvProxyEntryDir, resolveLegacyNginxEnvProxyAppOutputPath } from "../../lib/env-proxy.js";
 import { resolveConfiguredStoragePath } from '../../lib/env-paths.js';
 import { input } from "../../lib/inquirer.js";
 import { announceTargetEnv, failTask, isInteractiveTerminal, printInfo, startTask, succeedTask } from '../../lib/ui.js';
+import path from 'node:path';
 import { builtinDbContainerName, managedDockerNetworkName, removeDockerContainerIfExists, removeDockerNetworkIfUnused, removePathIfExists, resolveManagedLocalAppPath, shouldRemoveManagedLocalAppFiles, } from './shared.js';
 function formatDestroyFailure(envName, message) {
     return [
@@ -51,9 +53,7 @@ function buildDestroyPrompt(runtime, options) {
         if (options.removesManagedLocalAppFiles) {
             lines.push('CLI-managed local app files will also be removed.');
         }
-        else if (runtime.kind === 'local') {
-            lines.push('Custom local app source files will be kept.');
-        }
+        lines.push('Env-specific proxy entry files generated by `nb env proxy` will also be removed when present.');
         if (options.removesStorageData) {
             lines.push('Storage data will be removed.');
         }
@@ -195,13 +195,20 @@ export default class AppDestroy extends Command {
                         await removePathIfExists(localAppPath, `managed app files for "${runtime.envName}"`);
                         succeedTask(`Managed local app files removed for "${runtime.envName}".`);
                     }
-                    else if (localAppPath) {
-                        printInfo(`Keeping custom local app files for "${runtime.envName}" at "${localAppPath}".`);
-                    }
                     else {
                         printInfo(`No saved local app path found for "${runtime.envName}".`);
                     }
                 }
+                const proxyEntryDirs = [
+                    resolveEnvProxyEntryDir(runtime.envName, { provider: 'nginx' }),
+                    resolveEnvProxyEntryDir(runtime.envName, { provider: 'caddy' }),
+                    path.dirname(resolveLegacyNginxEnvProxyAppOutputPath(runtime.envName)),
+                ];
+                startTask(`Removing env proxy entry files for "${runtime.envName}"...`);
+                for (const proxyEntryDir of proxyEntryDirs) {
+                    await removePathIfExists(proxyEntryDir, `proxy entry files for "${runtime.envName}"`);
+                }
+                succeedTask(`Env proxy entry files removed for "${runtime.envName}".`);
                 const configuredStoragePath = resolveConfiguredStoragePath(runtime.env.config);
                 if (configuredStoragePath) {
                     startTask(`Removing storage data for "${runtime.envName}"...`);

package/dist/commands/app/restart.js

@@ -11,6 +11,7 @@ import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, stopDockerContainer, } from '../../lib/app-runtime.js';
 import { formatAppUrl, resolveManagedAppApiBaseUrl, waitForAppReady } from '../../lib/app-health.js';
 import { recreateSavedDockerApp } from '../../lib/app-managed-resources.js';
+import { resolveAppUrlFromApiBaseUrl } from '../env/shared.js';
 import { run } from '../../lib/run-npm.js';
 import { announceTargetEnv, failTask, startTask, succeedTask } from '../../lib/ui.js';
 function argvHasToken(argv, tokens) {
@@ -54,6 +55,13 @@ function formatDockerRestartFailure(envName, message) {
         `Details: ${message}`,
     ].join('\n');
 }
+function resolveDisplayAppUrl(apiBaseUrl, port, appPublicPath) {
+    const resolvedFromApiBaseUrl = resolveAppUrlFromApiBaseUrl(apiBaseUrl);
+    if (resolvedFromApiBaseUrl) {
+        return resolvedFromApiBaseUrl;
+    }
+    return formatAppUrl(port, appPublicPath);
+}
 export default class AppRestart extends Command {
     static hidden = false;
     static description = 'Restart NocoBase for the selected env. When applicable, the CLI synchronizes licensed commercial plugins first, then restarts the local app or recreates the saved Docker container.';
@@ -183,10 +191,11 @@ export default class AppRestart extends Command {
                 failTask(`Failed to recreate NocoBase for "${runtime.envName}".`);
                 this.error(formatDockerRestartFailure(runtime.envName, message));
             }
-            const appUrl = formatAppUrl(runtime.env.appPort === undefined || runtime.env.appPort === null ? undefined : String(runtime.env.appPort), runtime.env.config?.appPublicPath);
+            const apiBaseUrl = resolveManagedAppApiBaseUrl(runtime);
+            const appUrl = resolveDisplayAppUrl(apiBaseUrl, runtime.env.appPort === undefined || runtime.env.appPort === null ? undefined : String(runtime.env.appPort), runtime.env.config?.appPublicPath);
             await waitForAppReady({
                 envName: runtime.envName,
-                apiBaseUrl: resolveManagedAppApiBaseUrl(runtime),
+                apiBaseUrl,
                 containerName: runtime.containerName,
                 logHint: `You can inspect startup logs with \`nb app logs --env ${runtime.envName}\`.`,
                 ...(flags.verbose ? { verbose: true } : {}),

package/dist/commands/app/shared.js

@@ -11,6 +11,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { buildDockerDbContainerName } from '../../lib/app-runtime.js';
 import { resolveConfiguredEnvPath } from '../../lib/cli-home.js';
+import { resolveConfiguredAppPath } from '../../lib/env-paths.js';
 import { commandOutput, run } from '../../lib/run-npm.js';
 export function resolveConfiguredPath(value) {
     return resolveConfiguredEnvPath(value);
@@ -115,8 +116,8 @@ export function managedDockerNetworkName(runtime) {
     return runtime.dockerNetworkName?.trim() || runtime.workspaceName?.trim() || undefined;
 }
 export function resolveManagedLocalAppPath(runtime) {
-    return runtime.projectRoot || resolveConfiguredPath(runtime.env.config.appRootPath);
+    return resolveConfiguredAppPath(runtime.env.config) || runtime.projectRoot || resolveConfiguredPath(runtime.env.config.appRootPath);
 }
 export function shouldRemoveManagedLocalAppFiles(runtime) {
-    return runtime.source === 'npm' || runtime.source === 'git';
+    return runtime.source === 'npm' || runtime.source === 'git' || runtime.source === 'local';
 }

package/dist/commands/app/start.js

@@ -12,6 +12,7 @@ import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-
 import { formatMissingManagedAppEnvMessage, managedAppLifecycleEnvVars, resolveManagedAppRuntime, runLocalNocoBaseCommand, } from '../../lib/app-runtime.js';
 import { AppHealthCheckError, formatAppUrl, isAppReady, resolveManagedAppApiBaseUrl, waitForAppReady, } from '../../lib/app-health.js';
 import { ensureBuiltinDbReady, ensureLocalPostinstall, ensureSavedLocalSource, recreateSavedDockerApp, } from '../../lib/app-managed-resources.js';
+import { resolveAppUrlFromApiBaseUrl } from '../env/shared.js';
 import { readManagedRuntimeEnvValues } from '../../lib/managed-env-file.js';
 import { run } from '../../lib/run-npm.js';
 import { announceTargetEnv, failTask, printInfo, printWarning, startTask, succeedTask } from '../../lib/ui.js';
@@ -87,6 +88,13 @@ function formatLocalClientExtractWarning(envName, message) {
         `Details: ${message}`,
     ].join('\n');
 }
+function resolveDisplayAppUrl(apiBaseUrl, port, appPublicPath) {
+    const resolvedFromApiBaseUrl = resolveAppUrlFromApiBaseUrl(apiBaseUrl);
+    if (resolvedFromApiBaseUrl) {
+        return resolvedFromApiBaseUrl;
+    }
+    return formatAppUrl(port, appPublicPath);
+}
 async function resolveDefaultLocalCdnBaseUrl(runtime) {
     let envValues = {};
     if (runtime.env.config && typeof runtime.env.config === 'object') {
@@ -222,8 +230,8 @@ export default class AppStart extends Command {
                 onSucceedTask: succeedTask,
                 onFailTask: failTask,
             });
-            const appUrl = formatAppUrl(runtime.env.appPort === undefined || runtime.env.appPort === null ? undefined : String(runtime.env.appPort), runtime.env.config?.appPublicPath);
             const apiBaseUrl = resolveManagedAppApiBaseUrl(runtime);
+            const appUrl = resolveDisplayAppUrl(apiBaseUrl, runtime.env.appPort === undefined || runtime.env.appPort === null ? undefined : String(runtime.env.appPort), runtime.env.config?.appPublicPath);
             startTask(`Recreating the Docker app container for "${runtime.envName}"...`);
             try {
                 await run('docker', ['rm', '-f', runtime.containerName], {
@@ -282,10 +290,10 @@ export default class AppStart extends Command {
         const effectivePort = runtime.env.appPort !== undefined && runtime.env.appPort !== null
             ? String(runtime.env.appPort).trim()
             : undefined;
-        const appUrl = formatAppUrl(effectivePort, runtime.env.config?.appPublicPath);
         const apiBaseUrl = resolveManagedAppApiBaseUrl(runtime, {
             portOverride: effectivePort,
         });
+        const appUrl = resolveDisplayAppUrl(apiBaseUrl, effectivePort, runtime.env.config?.appPublicPath);
         let defaultCdnBaseUrl;
         if (await isAppReady(apiBaseUrl, { requestTimeoutMs: 1_500 })) {
             if (flags.daemon === false) {

package/dist/commands/app/upgrade.js

@@ -13,6 +13,7 @@ import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-
 import { DEFAULT_DOCKER_REGISTRY } from "../../lib/docker-image.js";
 import { confirm } from "../../lib/inquirer.js";
 import { announceTargetEnv, isInteractiveTerminal, printInfo, printWarning, succeedTask } from '../../lib/ui.js';
+import { resolveAppUrlFromApiBaseUrl } from '../env/shared.js';
 function trimValue(value) {
     return String(value ?? '').trim();
 }
@@ -25,15 +26,16 @@ function formatAppUrl(port) {
     return value ? `http://127.0.0.1:${value}` : undefined;
 }
 function formatDisplayUrl(apiBaseUrl, appPort) {
+    const resolvedFromApiBaseUrl = resolveAppUrlFromApiBaseUrl(apiBaseUrl);
+    if (resolvedFromApiBaseUrl) {
+        return resolvedFromApiBaseUrl;
+    }
     const appUrl = formatAppUrl(appPort);
     if (appUrl) {
         return appUrl;
     }
     const value = trimValue(apiBaseUrl);
-    if (!value) {
-        return undefined;
-    }
-    return value.replace(/\/api\/?$/, '');
+    return value ? value.replace(/\/api\/?$/, '') : undefined;
 }
 function readEnvValue(env, key) {
     return trimValue(env.config[key]);

package/dist/commands/config/delete.js

@@ -23,6 +23,8 @@ export default class ConfigDelete extends Command {
         '<%= config.bin %> <%= command.id %> proxy.nb-cli-root',
         '<%= config.bin %> <%= command.id %> proxy.upstream-host',
         '<%= config.bin %> <%= command.id %> bin.yarn',
+        '<%= config.bin %> <%= command.id %> log.enabled',
+        '<%= config.bin %> <%= command.id %> log.retention-days',
     ];
     static args = {
         key: Args.string({

package/dist/commands/config/get.js

@@ -22,6 +22,8 @@ export default class ConfigGet extends Command {
         '<%= config.bin %> <%= command.id %> proxy.nb-cli-root',
         '<%= config.bin %> <%= command.id %> proxy.upstream-host',
         '<%= config.bin %> <%= command.id %> bin.yarn',
+        '<%= config.bin %> <%= command.id %> log.enabled',
+        '<%= config.bin %> <%= command.id %> log.retention-days',
     ];
     static args = {
         key: Args.string({

package/dist/commands/config/set.js

@@ -24,6 +24,8 @@ export default class ConfigSet extends Command {
         '<%= config.bin %> <%= command.id %> proxy.nb-cli-root /workspace',
         '<%= config.bin %> <%= command.id %> proxy.upstream-host host.docker.internal',
         '<%= config.bin %> <%= command.id %> bin.yarn yarn',
+        '<%= config.bin %> <%= command.id %> log.enabled false',
+        '<%= config.bin %> <%= command.id %> log.retention-days 14',
     ];
     static args = {
         key: Args.string({

package/dist/commands/env/add.js

@@ -265,17 +265,17 @@ export default class EnvAdd extends Command {
             type: 'select',
             message: envAddText('prompts.authType.message'),
             options: [
-                {
-                    value: 'basic',
-                    label: envAddText('prompts.authType.basicLabel'),
-                    hint: envAddText('prompts.authType.basicHint'),
-                },
                 {
                     value: 'oauth',
                     label: envAddText('prompts.authType.oauthLabel'),
                     hint: envAddText('prompts.authType.oauthHint'),
                 },
                 { value: 'token', label: envAddText('prompts.authType.tokenLabel') },
+                {
+                    value: 'basic',
+                    label: envAddText('prompts.authType.basicLabel'),
+                    hint: envAddText('prompts.authType.basicHint'),
+                },
             ],
             initialValue: 'oauth',
             required: true,

package/dist/commands/init.js

@@ -16,6 +16,7 @@ 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";
@@ -84,6 +85,9 @@ function installLikeOnly(def) {
 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);
 }
@@ -145,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']);
 }
@@ -365,10 +402,15 @@ Prompt modes:
         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 = {
@@ -383,9 +425,24 @@ Prompt modes:
                 ...EnvAdd.prompts.password,
                 hidden: () => true,
             };
+            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;
     }
@@ -508,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),
@@ -516,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'),
@@ -553,15 +612,22 @@ Prompt modes:
         });
         const normalizedResults = this.normalizeInitResults({
             ...pickKeys(presetValues, [
+                'defaultApiHost',
                 'authType',
                 'accessToken',
                 'dbSchema',
                 'dbTablePrefix',
                 'dbUnderscored',
+                'installApiBaseUrl',
+                'installAuthType',
+                'installAccessToken',
+                'installUsername',
+                'installPassword',
                 'skipAuth',
                 'username',
                 'password',
             ]),
+            defaultApiHost,
             ...results,
         });
         const setupMode = resolveInitSetupMode(normalizedResults);
@@ -662,6 +728,7 @@ Prompt modes:
                     lang: c.lang,
                     appPath: c.appPath,
                     appPort: c.appPort,
+                    appPublicPath: c.appPublicPath,
                     skipDownload: c.skipDownload,
                 },
             },
@@ -711,6 +778,15 @@ 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) {
@@ -727,12 +803,17 @@ Prompt modes:
         if (apiBaseUrl) {
             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;
@@ -740,12 +821,17 @@ 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();
@@ -901,6 +987,7 @@ 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();
@@ -962,6 +1049,7 @@ Prompt modes:
             ...(appRootPath && !areConfiguredPathsEquivalent(appRootPath, derivedAppRootPath) ? { appRootPath } : {}),
             ...(storagePath && !areConfiguredPathsEquivalent(storagePath, derivedStoragePath) ? { storagePath } : {}),
             ...(appPort ? { appPort } : {}),
+            ...(appPublicPath ? { appPublicPath } : {}),
             ...(appKey ? { appKey } : {}),
             ...(timeZone ? { timezone: timeZone } : {}),
             ...(!skipDownload && results.devDependencies !== undefined
@@ -1298,6 +1386,22 @@ Prompt modes:
     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') {
@@ -1307,6 +1411,12 @@ Prompt modes:
             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;
     }
 }