@nocobase/cli 2.2.0-beta.7 → 2.2.0-beta.9

package/assets/env-proxy/nginx/app.conf.tpl

@@ -0,0 +1,23 @@
+# Rendered by `nb env proxy`.
+# Context:
+# publicBasePath={{publicBasePath}}
+# apiBasePath={{apiBasePath}}
+# wsPath={{wsPath}}
+# v2PublicPath={{v2PublicPath}}
+# backendUrl={{backendUrl}}
+# snippetsDir={{snippetsDir}}
+# uploadsDir={{uploadsDir}}
+# distRootDir={{distRootDir}}
+# entryDir={{entryDir}}
+# publicDir={{publicDir}}
+
+server {
+    listen 80;
+    server_name _;
+
+    # Add custom directives or locations above the managed block as needed.
+
+{{managedConfigBlock}}
+
+    # Add custom directives or locations below the managed block as needed.
+}

package/assets/env-proxy/nginx/nocobase.conf.tpl

@@ -0,0 +1,5 @@
+# Managed by `nb env proxy`. Changes will be overwritten.
+
+include {{snippetsDir}}/log-format-http.conf;
+include {{snippetsDir}}/maps-http.conf;
+include {{appConfigIncludePath}};

package/assets/env-proxy/nginx/snippets/dist-location.conf

@@ -0,0 +1,5 @@
+expires 365d;
+add_header Cache-Control "public" always;
+
+access_log off;
+autoindex off;

package/assets/env-proxy/nginx/snippets/gzip.conf

@@ -0,0 +1,17 @@
+gzip on;
+gzip_types
+    text/plain
+    text/css
+    text/xml
+    text/markdown
+    text/javascript
+    application/javascript
+    application/json
+    application/manifest+json
+    application/atom+xml
+    application/rss+xml
+    application/xml
+    application/xml+rss
+    application/xhtml+xml
+    application/wasm
+    image/svg+xml;

package/assets/env-proxy/nginx/snippets/log-format-http.conf

@@ -0,0 +1,13 @@
+log_format apm '"$time_local" client=$remote_addr '
+               'method=$request_method request="$request" '
+               'request_length=$request_length '
+               'status=$status bytes_sent=$bytes_sent '
+               'body_bytes_sent=$body_bytes_sent '
+               'referer=$http_referer '
+               'user_agent="$http_user_agent" '
+               'upstream_addr=$upstream_addr '
+               'upstream_status=$upstream_status '
+               'request_time=$request_time '
+               'upstream_response_time=$upstream_response_time '
+               'upstream_connect_time=$upstream_connect_time '
+               'upstream_header_time=$upstream_header_time';

package/assets/env-proxy/nginx/snippets/maps-http.conf

@@ -0,0 +1,14 @@
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ""      close;
+}
+
+map $http_x_forwarded_proto $upstream_x_forwarded_proto {
+    default $http_x_forwarded_proto;
+    ""      $scheme;
+}
+
+map $http_host $final_host {
+    default $http_host;
+    ""      $host;
+}

package/assets/env-proxy/nginx/snippets/mime-types.conf

@@ -0,0 +1,98 @@
+types {
+    text/html                                        html htm shtml;
+    text/css                                         css;
+    text/xml                                         xml;
+    image/gif                                        gif;
+    image/jpeg                                       jpeg jpg;
+    application/javascript                           js mjs;
+    application/atom+xml                             atom;
+    application/rss+xml                              rss;
+
+    text/mathml                                      mml;
+    text/plain                                       txt;
+    text/vnd.sun.j2me.app-descriptor                 jad;
+    text/vnd.wap.wml                                 wml;
+    text/x-component                                 htc;
+
+    image/avif                                       avif;
+    image/png                                        png;
+    image/svg+xml                                    svg svgz;
+    image/tiff                                       tif tiff;
+    image/vnd.wap.wbmp                               wbmp;
+    image/webp                                       webp;
+    image/x-icon                                     ico;
+    image/x-jng                                      jng;
+    image/x-ms-bmp                                   bmp;
+
+    font/woff                                        woff;
+    font/woff2                                       woff2;
+
+    application/java-archive                         jar war ear;
+    application/json                                 json;
+    application/mac-binhex40                         hqx;
+    application/msword                               doc;
+    application/pdf                                  pdf;
+    application/postscript                           ps eps ai;
+    application/rtf                                  rtf;
+    application/vnd.apple.mpegurl                    m3u8;
+    application/vnd.google-earth.kml+xml             kml;
+    application/vnd.google-earth.kmz                 kmz;
+    application/vnd.ms-excel                         xls;
+    application/vnd.ms-fontobject                    eot;
+    application/vnd.ms-powerpoint                    ppt;
+    application/vnd.oasis.opendocument.graphics      odg;
+    application/vnd.oasis.opendocument.presentation  odp;
+    application/vnd.oasis.opendocument.spreadsheet   ods;
+    application/vnd.oasis.opendocument.text          odt;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation
+                                                     pptx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+                                                     xlsx;
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document
+                                                     docx;
+    application/vnd.wap.wmlc                         wmlc;
+    application/wasm                                 wasm;
+    application/x-7z-compressed                      7z;
+    application/x-cocoa                              cco;
+    application/x-java-archive-diff                  jardiff;
+    application/x-java-jnlp-file                     jnlp;
+    application/x-makeself                           run;
+    application/x-perl                               pl pm;
+    application/x-pilot                              prc pdb;
+    application/x-rar-compressed                     rar;
+    application/x-redhat-package-manager             rpm;
+    application/x-sea                                sea;
+    application/x-shockwave-flash                    swf;
+    application/x-stuffit                            sit;
+    application/x-tcl                                tcl tk;
+    application/x-x509-ca-cert                       der pem crt;
+    application/x-xpinstall                          xpi;
+    application/xhtml+xml                            xhtml;
+    application/xspf+xml                             xspf;
+    application/zip                                  zip;
+
+    application/octet-stream                         bin exe dll;
+    application/octet-stream                         deb;
+    application/octet-stream                         dmg;
+    application/octet-stream                         iso img;
+    application/octet-stream                         msi msp msm;
+
+    audio/midi                                       mid midi kar;
+    audio/mpeg                                       mp3;
+    audio/ogg                                        ogg;
+    audio/x-m4a                                      m4a;
+    audio/x-realaudio                                ra;
+
+    video/3gpp                                       3gpp 3gp;
+    video/mp2t                                       ts;
+    video/mp4                                        mp4;
+    video/mpeg                                       mpeg mpg;
+    video/quicktime                                  mov;
+    video/webm                                       webm;
+    video/x-flv                                      flv;
+    video/x-m4v                                      m4v;
+    video/x-mng                                      mng;
+    video/x-ms-asf                                   asx asf;
+    video/x-ms-wmv                                   wmv;
+    video/x-msvideo                                  avi;
+}

package/assets/env-proxy/nginx/snippets/proxy-location.conf

@@ -0,0 +1,18 @@
+proxy_http_version 1.1;
+
+proxy_set_header Upgrade $http_upgrade;
+proxy_set_header Connection $connection_upgrade;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Proto $upstream_x_forwarded_proto;
+proxy_set_header Host $final_host;
+proxy_set_header Referer $http_referer;
+proxy_set_header User-Agent $http_user_agent;
+
+add_header Cache-Control "no-cache, no-store" always;
+proxy_cache_bypass $http_upgrade;
+
+proxy_connect_timeout 600;
+proxy_send_timeout 600;
+proxy_read_timeout 600;
+send_timeout 600;
+proxy_buffering off;

package/assets/env-proxy/nginx/snippets/spa-location.conf

@@ -0,0 +1,6 @@
+add_header Cache-Control "no-store, no-cache, must-revalidate" always;
+add_header X-Robots-Tag "noindex, nofollow" always;
+
+if_modified_since off;
+expires off;
+etag off;

package/assets/env-proxy/nginx/snippets/uploads-location.conf

@@ -0,0 +1,21 @@
+add_header Cache-Control "public" always;
+add_header X-Content-Type-Options "nosniff" always;
+
+access_log off;
+autoindex off;
+
+# Force potentially renderable uploaded files to download.
+location ~* \.(?:htm|html|svg|svgz|xhtml)$ {
+    add_header Cache-Control "public" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header Content-Disposition "attachment" always;
+}
+
+# Let Markdown files render as plain Markdown text.
+location ~* \.md$ {
+    default_type text/markdown;
+
+    add_header Cache-Control "public" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header Content-Disposition "inline" always;
+}

package/dist/commands/app/start.js

@@ -37,6 +37,9 @@ function buildLicenseSyncArgv(envName, options) {
 }
 function resolveHookCommand(value) {
     const text = String(value ?? '').trim();
+    if (text === 'init') {
+        return text;
+    }
     if (text === 'app:restart' || text === 'app:upgrade') {
         return text;
     }
@@ -225,7 +228,7 @@ export default class AppStart extends Command {
         }),
         'hook-command': Flags.string({
             hidden: true,
-            options: ['app:start', 'app:restart', 'app:upgrade'],
+            options: ['init', 'app:start', 'app:restart', 'app:upgrade'],
         }),
     };
     async run() {

package/dist/commands/install.js

@@ -13,11 +13,11 @@ import path from 'node:path';
 import { exit } from 'node:process';
 import { appendAppPublicPath } from '../lib/app-public-path.js';
 import { runPromptCatalog, } from "../lib/prompt-catalog.js";
-import { applyCliLocale, localeText, resolveCliLocale, translateCli } from "../lib/cli-locale.js";
+import { applyCliLocale, localeText, translateCli } from "../lib/cli-locale.js";
 import { resolveConfiguredEnvPath, resolveDefaultConfigScope, resolveEnvRoot, resolveEnvRelativePath, } from '../lib/cli-home.js';
 import { defaultDockerContainerPrefix, defaultDockerNetworkName, managedAppLifecycleEnvVars, } from '../lib/app-runtime.js';
-import { resolveDefaultApiHost, resolveDockerContainerPrefix, resolveDockerNetworkName } from '../lib/cli-config.js';
-import { DEFAULT_DOCKER_VERSION, resolveDockerImageRef } from "../lib/docker-image.js";
+import { getCliConfigValue, resolveDefaultApiHost, resolveDockerContainerPrefix, resolveDockerNetworkName, } from '../lib/cli-config.js';
+import { DEFAULT_DOCKER_VERSION, DEFAULT_NB_IMAGE_VARIANT, inferNbImageRegistryFromRepository, normalizeNbImageVariant, resolveBuiltinDbImage, resolveDockerImageContainerPort, resolveDockerImageRef, resolveOfficialDockerRegistry, } from "../lib/docker-image.js";
 import { findAvailableTcpPort, validateAppPublicPath, validateAvailableTcpPort, validateTcpPort, validateEnvKey, } from "../lib/prompt-validators.js";
 import { validateExternalDbConfig, validateMysqlLowerCaseTableNamesCompatibility } from "../lib/db-connection-check.js";
 import { formatMissingManagedAppEnvMessage } from '../lib/app-runtime.js';
@@ -31,7 +31,7 @@ import { startDockerLogFollower } from '../lib/docker-log-stream.js';
 import { buildInitAppEnvVarsFromConfig } from '../lib/managed-init-env.js';
 import { buildHookContext, persistHookScript, resolveHookScriptPath, runHookScriptHook, } from '../lib/hook-script.js';
 import { areConfiguredPathsEquivalent, deriveConfiguredSourcePath, deriveConfiguredStoragePath, inferConfiguredAppPathFromLegacyConfig, } from '../lib/env-paths.js';
-import Download, { defaultDockerRegistryForLang } from './download.js';
+import Download from './download.js';
 import EnvAdd from "./env/add.js";
 import { resolveAppUrlFromApiBaseUrl } from "./env/shared.js";
 const DEFAULT_INSTALL_ENV_NAME = 'local';
@@ -45,18 +45,6 @@ const DEFAULT_INSTALL_DB_PORTS = {
     mariadb: '3306',
     kingbase: '54321',
 };
-const DEFAULT_INSTALL_BUILTIN_DB_IMAGES = {
-    postgres: 'postgres:16',
-    mysql: 'mysql:8',
-    mariadb: 'mariadb:11',
-    kingbase: 'registry.cn-shanghai.aliyuncs.com/nocobase/kingbase:v009r001c001b0030_single_x86',
-};
-const DEFAULT_INSTALL_BUILTIN_DB_IMAGES_ZH_CN = {
-    postgres: 'registry.cn-shanghai.aliyuncs.com/nocobase/postgres:16',
-    mysql: 'registry.cn-shanghai.aliyuncs.com/nocobase/mysql:8',
-    mariadb: 'registry.cn-shanghai.aliyuncs.com/nocobase/mariadb:11',
-    kingbase: 'registry.cn-shanghai.aliyuncs.com/nocobase/kingbase:v009r001c001b0030_single_x86',
-};
 const DEFAULT_INSTALL_DB_DATABASE = 'nocobase';
 const DEFAULT_INSTALL_DB_USER = 'nocobase';
 const DEFAULT_INSTALL_DB_PASSWORD = 'nocobase';
@@ -179,18 +167,15 @@ function downloadVersionPromptValue(version) {
 }
 function supportsBuiltinDbDialect(value) {
     const dialect = String(value ?? '').trim();
-    return Object.prototype.hasOwnProperty.call(DEFAULT_INSTALL_BUILTIN_DB_IMAGES, dialect);
+    return INSTALL_DB_DIALECTS.includes(dialect);
 }
 export function defaultDbPortForDialect(value) {
     const dialect = String(value ?? 'postgres').trim();
     return DEFAULT_INSTALL_DB_PORTS[isInstallDbDialect(dialect) ? dialect : 'postgres'];
 }
-function defaultBuiltinDbImageForDialect(value) {
+function defaultBuiltinDbImageForDialect(value, options) {
     const dialect = String(value ?? 'postgres').trim();
-    const defaults = resolveCliLocale(process.env.NB_LOCALE) === 'zh-CN'
-        ? DEFAULT_INSTALL_BUILTIN_DB_IMAGES_ZH_CN
-        : DEFAULT_INSTALL_BUILTIN_DB_IMAGES;
-    return supportsBuiltinDbDialect(dialect) ? defaults[dialect] : defaults.postgres;
+    return resolveBuiltinDbImage(dialect, { registry: options?.registry });
 }
 function defaultDbDatabaseForDialect(value) {
     return String(value ?? '').trim() === 'kingbase' ? 'kingbase' : DEFAULT_INSTALL_DB_DATABASE;
@@ -1279,19 +1264,25 @@ export default class Install extends Command {
         return builtinDb && Install.shouldPublishBuiltinDbPort(values.source);
     }
     static async buildDbPromptInitialValues(params) {
-        if (params.flags['db-port'] !== undefined) {
-            return {};
-        }
+        const configuredRegistry = await getCliConfigValue('nb-image-registry');
         const values = {
             ...params.downloadResults,
             ...params.dbPreset,
         };
+        const dockerRegistry = String(values.dockerRegistry ?? '').trim() || resolveOfficialDockerRegistry(configuredRegistry);
+        const dialect = String(values.dbDialect ?? 'postgres').trim() || 'postgres';
+        const initialValues = values.builtinDb !== false && params.dbPreset.builtinDbImage === undefined
+            ? { builtinDbImage: defaultBuiltinDbImageForDialect(dialect, { registry: dockerRegistry }) }
+            : {};
+        if (params.flags['db-port'] !== undefined) {
+            return initialValues;
+        }
         if (!Install.shouldPublishBuiltinDbPortForValues(values)) {
-            return {};
+            return initialValues;
         }
-        const dialect = String(values.dbDialect ?? 'postgres').trim() || 'postgres';
         const defaultPort = defaultDbPortForDialect(dialect);
         return {
+            ...initialValues,
             dbPort: await Install.resolveAvailableDefaultPort(defaultPort, {
                 label: `Default ${dialect} port`,
                 warn: params.warnOnPortFallback ?? true,
@@ -1302,12 +1293,13 @@ export default class Install extends Command {
      * When install runs {@link Download.prompts} after app prompts, align the download
      * output directory with app settings, while Docker registry defaults follow the CLI locale.
      */
-    static buildDownloadPromptOptionsForInstall(appResults, envName) {
+    static async buildDownloadPromptOptionsForInstall(appResults, envName) {
         const appRoot = resolveConfiguredSourcePathValue(appResults, envName);
         const lang = String(appResults.lang ?? DEFAULT_INSTALL_LANG).trim() || DEFAULT_INSTALL_LANG;
+        const dockerRegistry = resolveOfficialDockerRegistry(await getCliConfigValue('nb-image-registry'));
         const initialValues = {
             lang,
-            dockerRegistry: defaultDockerRegistryForLang(process.env.NB_LOCALE),
+            dockerRegistry,
             outputDir: appRoot,
         };
         const values = {
@@ -1468,8 +1460,6 @@ export default class Install extends Command {
                 '-d',
                 '--name',
                 containerName,
-                '--restart',
-                'always',
                 '--network',
                 networkName,
                 '-e',
@@ -1512,8 +1502,6 @@ export default class Install extends Command {
                 '-d',
                 '--name',
                 containerName,
-                '--restart',
-                'always',
                 '--network',
                 networkName,
                 '-e',
@@ -1558,8 +1546,6 @@ export default class Install extends Command {
                 '-d',
                 '--name',
                 containerName,
-                '--restart',
-                'always',
                 '--network',
                 networkName,
                 '-e',
@@ -1604,8 +1590,6 @@ export default class Install extends Command {
                 '-d',
                 '--name',
                 containerName,
-                '--restart',
-                'always',
                 '--network',
                 networkName,
                 '--platform',
@@ -1768,12 +1752,15 @@ export default class Install extends Command {
         return plan;
     }
     static async buildDockerAppPlan(params) {
+        const configuredRegistry = await getCliConfigValue('nb-image-registry');
+        const configuredVariant = normalizeNbImageVariant(await getCliConfigValue('nb-image-variant')) ?? DEFAULT_NB_IMAGE_VARIANT;
         const dockerRegistry = String(downloadResultsValue(params.downloadResults, 'dockerRegistry') ?? '').trim() ||
-            defaultDockerRegistryForLang(process.env.NB_LOCALE);
+            resolveOfficialDockerRegistry(configuredRegistry);
         const version = String(downloadResultsValue(params.downloadResults, 'version') ?? '').trim() || DEFAULT_DOCKER_VERSION;
         const imageRef = resolveDockerImageRef(dockerRegistry, version, {
-            defaultRegistry: defaultDockerRegistryForLang(process.env.NB_LOCALE),
+            defaultRegistry: resolveOfficialDockerRegistry(configuredRegistry),
             defaultVersion: DEFAULT_DOCKER_VERSION,
+            variant: inferNbImageRegistryFromRepository(dockerRegistry) ? configuredVariant : undefined,
         });
         const appPort = String(params.appResults.appPort ?? DEFAULT_INSTALL_APP_PORT).trim() || DEFAULT_INSTALL_APP_PORT;
         const configuredStoragePath = resolveConfiguredStoragePathValue(params.appResults, params.envName);
@@ -1800,17 +1787,16 @@ export default class Install extends Command {
             appResults: params.appResults,
             rootResults: params.rootResults,
         });
+        const containerPort = resolveDockerImageContainerPort(imageRef);
         const args = [
             'run',
             '-d',
             '--name',
             containerName,
-            '--restart',
-            'always',
             '--network',
             params.networkName,
             '-p',
-            `${appPort}:80`,
+            `${appPort}:${containerPort}`,
         ];
         if (envFile) {
             args.push('--env-file', envFile);
@@ -2000,12 +1986,15 @@ export default class Install extends Command {
     }
     async ensureSkippedDownloadInputsReady(params) {
         if (params.source === 'docker') {
+            const configuredRegistry = await getCliConfigValue('nb-image-registry');
+            const configuredVariant = normalizeNbImageVariant(await getCliConfigValue('nb-image-variant')) ?? DEFAULT_NB_IMAGE_VARIANT;
             const dockerRegistry = String(downloadResultsValue(params.downloadResults, 'dockerRegistry') ?? '').trim() ||
-                defaultDockerRegistryForLang(process.env.NB_LOCALE);
+                resolveOfficialDockerRegistry(configuredRegistry);
             const version = String(downloadResultsValue(params.downloadResults, 'version') ?? '').trim() || DEFAULT_DOCKER_VERSION;
             const imageRef = resolveDockerImageRef(dockerRegistry, version, {
-                defaultRegistry: defaultDockerRegistryForLang(process.env.NB_LOCALE),
+                defaultRegistry: resolveOfficialDockerRegistry(configuredRegistry),
                 defaultVersion: DEFAULT_DOCKER_VERSION,
+                variant: inferNbImageRegistryFromRepository(dockerRegistry) ? configuredVariant : undefined,
             });
             const imageExists = await commandSucceeds('docker', ['image', 'inspect', imageRef]);
             if (!imageExists) {
@@ -2264,6 +2253,13 @@ export default class Install extends Command {
         }
         await this.config.runCommand('env:update', [params.envName]);
     }
+    buildAppStartArgv(params) {
+        const argv = ['--env', params.envName, '--yes', '--no-sync-licensed-plugins', '--hook-command', 'init'];
+        if (params.verbose) {
+            argv.push('--verbose');
+        }
+        return argv;
+    }
     async runInstallHookIfNeeded(params) {
         const appPath = Install.resolveAbsoluteAppPath(params.envName, params.appResults);
         const savedHookScript = Install.toOptionalPromptString(params.appResults.hookScript);
@@ -2401,7 +2397,7 @@ export default class Install extends Command {
         if (resumePreset?.appPreset?.hookScript !== undefined && appResults.hookScript === undefined) {
             appResults.hookScript = resumePreset.appPreset.hookScript;
         }
-        const downloadOpts = Install.buildDownloadPromptOptionsForInstall(appResults, envName);
+        const downloadOpts = await Install.buildDownloadPromptOptionsForInstall(appResults, envName);
         downloadOpts.values = {
             ...(resumePreset?.downloadPreset ?? {}),
             ...downloadOpts.values,
@@ -2508,7 +2504,6 @@ export default class Install extends Command {
         const parsed = {
             ...flags,
         };
-        const defaultApiHost = await resolveDefaultApiHost();
         if (parsed['skip-auth'] && (parsed['access-token'] !== undefined || parsed.token !== undefined)) {
             this.error('--skip-auth cannot be used with --access-token or --token.');
         }
@@ -2588,8 +2583,7 @@ export default class Install extends Command {
             dbResults.dbUser = builtinDbPlan.dbUser;
             dbResults.dbPassword = builtinDbPlan.dbPassword;
         }
-        let dockerAppPlan;
-        let localAppPlan;
+        let shouldStartApp = false;
         if (source === 'docker' || source === 'npm' || source === 'git') {
             this.logStage('Preparing application');
             if (source === 'docker') {
@@ -2601,111 +2595,28 @@ export default class Install extends Command {
                     printInfo('Application image ready.');
                 }
                 if (!parsed['prepare-only']) {
-                    await this.runInstallHookIfNeeded({
-                        hookName: 'beforeAppInstall',
-                        envName,
-                        source,
-                        appResults,
-                        downloadResults,
-                        dbResults,
-                        rootResults,
-                        envAddResults,
-                        defaultApiHost,
-                    });
-                    dockerAppPlan = await this.installDockerApp({
-                        envName,
-                        dockerNetworkName,
-                        dockerContainerPrefix,
-                        appResults,
-                        downloadResults,
-                        dbResults,
-                        rootResults,
-                        builtinDbPlan,
-                        force: parsed.force,
-                        commandStdio,
-                    });
-                    appResults.appKey = dockerAppPlan.appKey;
-                    appResults.timeZone = dockerAppPlan.timeZone;
+                    shouldStartApp = true;
                 }
             }
             else if (source === 'npm' || source === 'git') {
-                const localSource = source === 'npm' ? 'npm' : 'git';
-                const projectRoot = parsed['skip-download'] || parsed['prepare-only']
-                    ? Install.resolveLocalProjectRoot({
-                        envName,
-                        appResults,
-                        downloadResults,
-                    })
-                    : await this.downloadLocalApp({
+                if (!parsed['skip-download'] && !parsed['prepare-only']) {
+                    await this.downloadLocalApp({
                         envName,
                         appResults,
                         downloadResults,
                         verbose: parsed.verbose,
                     });
-                if (!parsed['skip-download'] && !parsed['prepare-only']) {
                     printInfo('Application files ready.');
                 }
                 if (!parsed['prepare-only']) {
-                    await this.runInstallHookIfNeeded({
-                        hookName: 'beforeAppInstall',
-                        envName,
-                        source,
-                        appResults,
-                        downloadResults,
-                        dbResults,
-                        rootResults,
-                        envAddResults,
-                        projectRoot,
-                        defaultApiHost,
-                    });
-                    localAppPlan = await this.startLocalApp({
-                        envName,
-                        source: localSource,
-                        projectRoot,
-                        appResults,
-                        dbResults,
-                        rootResults,
-                        commandStdio,
-                    });
-                    appResults.appKey = localAppPlan.appKey;
-                    appResults.timeZone = localAppPlan.timeZone;
+                    shouldStartApp = true;
                 }
             }
         }
         else {
             this.logDetail('Skipped app download and install.');
         }
-        if (dockerAppPlan || localAppPlan) {
-            this.logStage('Starting NocoBase');
-            await this.waitForAppHealthCheck(Install.resolveApiBaseUrl({
-                appResults,
-                envAddResults,
-                defaultApiHost,
-            }), {
-                containerName: dockerAppPlan?.containerName,
-                verbose: parsed.verbose,
-            });
-            const displayApiBaseUrl = Install.resolveApiBaseUrl({
-                appResults,
-                envAddResults,
-                defaultApiHost,
-            });
-            printInfo(`NocoBase is ready at ${formatInstallDisplayUrl(displayApiBaseUrl)}`);
-            appResults.setupState = 'installed';
-            await this.runInstallHookIfNeeded({
-                hookName: 'afterAppStart',
-                envName,
-                source,
-                appResults,
-                downloadResults,
-                dbResults,
-                rootResults,
-                envAddResults,
-                projectRoot: localAppPlan?.projectRoot,
-                defaultApiHost,
-            });
-        }
-        if (dockerAppPlan || localAppPlan || builtinDbPlan) {
+        if (shouldStartApp || builtinDbPlan) {
             await this.saveInstalledEnv({
                 envName,
                 appResults,
@@ -2715,10 +2626,14 @@ export default class Install extends Command {
                 envAddResults,
             });
         }
+        if (shouldStartApp) {
+            this.logStage('Starting NocoBase');
+            await this.config.runCommand('app:start', this.buildAppStartArgv({ envName, verbose: parsed.verbose }));
+        }
         await this.syncInstalledEnvConnection({
             envName,
             envAddResults,
-            appReady: Boolean(dockerAppPlan || localAppPlan),
+            appReady: shouldStartApp,
             skipAuth: Boolean(parsed['skip-auth']),
         });
         if (!parsed['prepare-only']) {
@@ -2727,7 +2642,7 @@ export default class Install extends Command {
         if (parsed['prepare-only']) {
             printInfo(`Preparation complete for "${envName}". Activate the license, then run \`nb app start --env ${envName}\`.`);
         }
-        else if (!dockerAppPlan && !localAppPlan) {
+        else if (!shouldStartApp) {
             printInfo(`Install config for "${envName}" has been saved.`);
         }
     }