@nocobase/cli 2.1.0-alpha.23 → 2.1.0-alpha.25

package/dist/commands/install.js

@@ -16,6 +16,7 @@ import path from 'node:path';
 import { exit } from 'node:process';
 import { runPromptCatalog, } from "../lib/prompt-catalog.js";
 import { applyCliLocale, localeText, resolveCliLocale, translateCli, } from "../lib/cli-locale.js";
+import { resolveConfiguredEnvPath, resolveDefaultConfigScope, resolveEnvRelativePath, } from '../lib/cli-home.js';
 import { findAvailableTcpPort, validateAvailableTcpPort, validateTcpPort, validateEnvKey, } from "../lib/prompt-validators.js";
 import { formatMissingManagedAppEnvMessage } from '../lib/app-runtime.js';
 import { run, runNocoBaseCommand } from '../lib/run-npm.js';
@@ -53,7 +54,6 @@ const DEFAULT_INSTALL_ROOT_USERNAME = 'nocobase';
 const DEFAULT_INSTALL_ROOT_EMAIL = 'admin@nocobase.com';
 const DEFAULT_INSTALL_ROOT_PASSWORD = 'admin123';
 const DEFAULT_INSTALL_ROOT_NICKNAME = 'Super Admin';
-const CONFIG_SCOPE = 'project';
 const APP_HEALTH_CHECK_INTERVAL_MS = 2_000;
 const APP_HEALTH_CHECK_TIMEOUT_MS = 600_000;
 const APP_HEALTH_CHECK_REQUEST_TIMEOUT_MS = 5_000;
@@ -137,6 +137,11 @@ function argvHasToken(argv, tokens) {
 function isInstallDbDialect(value) {
     return INSTALL_DB_DIALECTS.includes(value);
 }
+function downloadVersionPromptValue(version) {
+    return version === 'latest' || version === 'beta' || version === 'alpha'
+        ? version
+        : 'other';
+}
 function supportsBuiltinDbDialect(value) {
     const dialect = String(value ?? '').trim();
     return Object.prototype.hasOwnProperty.call(DEFAULT_INSTALL_BUILTIN_DB_IMAGES, dialect);
@@ -303,6 +308,7 @@ export default class Install extends Command {
             required: false,
         }),
         'builtin-db': Flags.boolean({
+            allowNo: true,
             description: 'Create and connect a CLI-managed built-in database for the app',
             default: false,
         }),
@@ -569,7 +575,7 @@ export default class Install extends Command {
         if (argvHasToken(argv, ['--fetch-source'])) {
             preset.fetchSource = flags['fetch-source'];
         }
-        if (argvHasToken(argv, ['--builtin-db'])) {
+        if (argvHasToken(argv, ['--builtin-db', '--no-builtin-db'])) {
             preset.builtinDb = flags['builtin-db'];
         }
         if (flags['db-dialect'] !== undefined) {
@@ -588,6 +594,7 @@ export default class Install extends Command {
             const v = String(flags['db-host'] ?? '').trim();
             if (v) {
                 preset.dbHost = v;
+                preset.builtinDb = false;
             }
         }
         if (flags['db-port'] !== undefined) {
@@ -682,7 +689,14 @@ export default class Install extends Command {
         };
         const downloadPreset = {
             ...(source ? { source } : {}),
-            ...(downloadVersion ? { version: downloadVersion } : {}),
+            ...(downloadVersion
+                ? {
+                    version: downloadVersionPromptValue(downloadVersion),
+                    ...(downloadVersionPromptValue(downloadVersion) === 'other'
+                        ? { otherVersion: downloadVersion }
+                        : {}),
+                }
+                : {}),
             ...(dockerRegistry ? { dockerRegistry } : {}),
             ...(dockerPlatform ? { dockerPlatform } : {}),
             ...(gitUrl ? { gitUrl } : {}),
@@ -746,7 +760,7 @@ export default class Install extends Command {
         if (!parsed.resume) {
             return undefined;
         }
-        const env = await getEnv(parsed.env, { scope: CONFIG_SCOPE });
+        const env = await getEnv(parsed.env, { scope: resolveDefaultConfigScope() });
         if (!env) {
             throw new Error(formatMissingManagedAppEnvMessage(parsed.env));
         }
@@ -861,7 +875,11 @@ export default class Install extends Command {
             preset.source = String(flags.source).trim();
         }
         if (flags.version !== undefined) {
-            preset.version = String(flags.version).trim() || 'latest';
+            const version = String(flags.version).trim() || 'latest';
+            preset.version = downloadVersionPromptValue(version);
+            if (preset.version === 'other') {
+                preset.otherVersion = version;
+            }
         }
         if (flags['docker-registry'] !== undefined) {
             const value = String(flags['docker-registry'] ?? '').trim();
@@ -891,7 +909,10 @@ export default class Install extends Command {
             preset.npmRegistry =
                 typeof flags['npm-registry'] === 'string' ? flags['npm-registry'] : '';
         }
-        if (argvHasToken(argv, ['--replace', '-r'])) {
+        if (flags.resume && !argvHasToken(argv, ['--replace', '-r'])) {
+            preset.replace = true;
+        }
+        else if (argvHasToken(argv, ['--replace', '-r'])) {
             preset.replace = flags.replace;
         }
         if (argvHasToken(argv, ['--dev-dependencies', '--no-dev-dependencies', '-D'])) {
@@ -933,7 +954,7 @@ export default class Install extends Command {
             : Install.defaultWorkspaceName();
     }
     static async ensureWorkspaceName() {
-        return await ensureWorkspaceName(Install.defaultWorkspaceName(), { scope: CONFIG_SCOPE });
+        return await ensureWorkspaceName(Install.defaultWorkspaceName(), { scope: resolveDefaultConfigScope() });
     }
     static buildBuiltinDbNetworkName(envName, workspaceName) {
         return Install.buildBuiltinDbResourcePrefix(envName, workspaceName);
@@ -982,9 +1003,11 @@ export default class Install extends Command {
                 && dbHostInput !== 'localhost'
                 ? dbHostInput
                 : containerName);
+        const storagePath = resolveConfiguredEnvPath(params.storagePath)
+            ?? resolveEnvRelativePath(defaultInstallStoragePath(params.envName));
         if (dbDialect === 'postgres') {
             const image = String(params.builtinDbImage ?? '').trim() || defaultBuiltinDbImageForDialect(dbDialect);
-            const dataDir = path.resolve(params.storagePath, 'db', 'postgres');
+            const dataDir = path.resolve(storagePath, 'db', 'postgres');
             const args = [
                 'run',
                 '-d',
@@ -1028,7 +1051,7 @@ export default class Install extends Command {
         }
         if (dbDialect === 'mysql') {
             const image = String(params.builtinDbImage ?? '').trim() || defaultBuiltinDbImageForDialect(dbDialect);
-            const dataDir = path.resolve(params.storagePath, 'db', 'mysql');
+            const dataDir = path.resolve(storagePath, 'db', 'mysql');
             const dbUser = String(params.dbUser ?? DEFAULT_INSTALL_DB_USER).trim() || DEFAULT_INSTALL_DB_USER;
             const dbDatabase = String(params.dbDatabase ?? defaultDbDatabase).trim() || defaultDbDatabase;
             const dbPassword = String(params.dbPassword ?? DEFAULT_INSTALL_DB_PASSWORD) || DEFAULT_INSTALL_DB_PASSWORD;
@@ -1074,7 +1097,7 @@ export default class Install extends Command {
         }
         if (dbDialect === 'mariadb') {
             const image = String(params.builtinDbImage ?? '').trim() || defaultBuiltinDbImageForDialect(dbDialect);
-            const dataDir = path.resolve(params.storagePath, 'db', 'mariadb');
+            const dataDir = path.resolve(storagePath, 'db', 'mariadb');
             const dbUser = String(params.dbUser ?? DEFAULT_INSTALL_DB_USER).trim() || DEFAULT_INSTALL_DB_USER;
             const dbDatabase = String(params.dbDatabase ?? defaultDbDatabase).trim() || defaultDbDatabase;
             const dbPassword = String(params.dbPassword ?? DEFAULT_INSTALL_DB_PASSWORD) || DEFAULT_INSTALL_DB_PASSWORD;
@@ -1120,7 +1143,7 @@ export default class Install extends Command {
         }
         if (dbDialect === 'kingbase') {
             const image = String(params.builtinDbImage ?? '').trim() || defaultBuiltinDbImageForDialect(dbDialect);
-            const dataDir = path.resolve(params.storagePath, 'db', 'kingbase');
+            const dataDir = path.resolve(storagePath, 'db', 'kingbase');
             const dbUser = String(params.dbUser ?? DEFAULT_INSTALL_DB_USER).trim() || DEFAULT_INSTALL_DB_USER;
             const dbDatabase = String(params.dbDatabase ?? defaultDbDatabase).trim() || defaultDbDatabase;
             const dbPassword = String(params.dbPassword ?? DEFAULT_INSTALL_DB_PASSWORD) || DEFAULT_INSTALL_DB_PASSWORD;
@@ -1207,6 +1230,7 @@ export default class Install extends Command {
     async removeDockerContainer(name) {
         await run('docker', ['rm', '-f', name], {
             errorName: 'docker rm',
+            stdio: 'ignore',
         });
     }
     async removeDockerContainerIfForced(params) {
@@ -1238,7 +1262,7 @@ export default class Install extends Command {
         }
         return env;
     }
-    async ensureBuiltinDbContainer(plan) {
+    async ensureBuiltinDbContainer(plan, options) {
         const exists = await this.dockerContainerExists(plan.containerName);
         if (exists) {
             p.log.info(`Built-in ${plan.dbDialect} container already exists: ${plan.containerName}`);
@@ -1247,6 +1271,7 @@ export default class Install extends Command {
         await mkdir(plan.dataDir, { recursive: true });
         await run('docker', plan.args, {
             errorName: 'docker run',
+            stdio: options?.stdio ?? 'ignore',
         });
     }
     async startBuiltinDb(params) {
@@ -1267,18 +1292,20 @@ export default class Install extends Command {
         });
         p.log.step(`Preparing built-in ${plan.dbDialect} database`);
         await this.ensureDockerNetwork(plan.networkName);
-        await this.removeDockerContainerIfForced({
+        const existingContainerKept = await this.removeDockerContainerIfForced({
             containerName: plan.containerName,
             displayName: `built-in ${plan.dbDialect} container`,
             force: params.force,
         });
-        if (Install.shouldPublishBuiltinDbPort(params.downloadResults.source)) {
+        if (!existingContainerKept && Install.shouldPublishBuiltinDbPort(params.downloadResults.source)) {
             const portError = await validateAvailableTcpPort(plan.dbPort);
             if (portError) {
                 throw new Error(`Built-in ${plan.dbDialect} needs host port ${plan.dbPort}, but ${portError}`);
             }
         }
-        await this.ensureBuiltinDbContainer(plan);
+        await this.ensureBuiltinDbContainer(plan, {
+            stdio: params.commandStdio ?? 'ignore',
+        });
         p.log.info(`Built-in ${plan.dbDialect} database is ready at ${plan.dbHost}:${plan.dbPort}`);
         return plan;
     }
@@ -1287,8 +1314,9 @@ export default class Install extends Command {
             || defaultDockerRegistryForLang(process.env.NB_LOCALE);
         const version = String(downloadResultsValue(params.downloadResults, 'version') ?? '').trim() || 'latest';
         const appPort = String(params.appResults.appPort ?? DEFAULT_INSTALL_APP_PORT).trim() || DEFAULT_INSTALL_APP_PORT;
-        const storagePath = path.resolve(String(params.appResults.storagePath ?? '').trim()
-            || defaultInstallStoragePath(params.envName));
+        const storagePath = resolveConfiguredEnvPath(String(params.appResults.storagePath ?? '').trim()
+            || defaultInstallStoragePath(params.envName))
+            ?? resolveEnvRelativePath(defaultInstallStoragePath(params.envName));
         const dbDialect = String(params.dbResults.dbDialect ?? 'postgres').trim() || 'postgres';
         const dbHost = String(params.dbResults.dbHost ?? DEFAULT_INSTALL_DB_HOST).trim() || DEFAULT_INSTALL_DB_HOST;
         const dbPort = String(params.dbResults.dbPort ?? defaultDbPortForDialect(dbDialect)).trim()
@@ -1332,7 +1360,7 @@ export default class Install extends Command {
             args,
         };
     }
-    async ensureDockerAppContainer(plan) {
+    async ensureDockerAppContainer(plan, options) {
         const exists = await this.dockerContainerExists(plan.containerName);
         if (exists) {
             p.log.info(`App container already exists: ${plan.containerName}`);
@@ -1341,6 +1369,7 @@ export default class Install extends Command {
         await mkdir(plan.storagePath, { recursive: true });
         await run('docker', plan.args, {
             errorName: 'docker run',
+            stdio: options?.stdio ?? 'ignore',
         });
         return 'created';
     }
@@ -1363,7 +1392,9 @@ export default class Install extends Command {
             displayName: 'app container',
             force: params.force,
         });
-        const containerState = await this.ensureDockerAppContainer(plan);
+        const containerState = await this.ensureDockerAppContainer(plan, {
+            stdio: params.commandStdio ?? 'ignore',
+        });
         if (containerState === 'existing') {
             const env = await this.inspectDockerContainerEnv(plan.containerName);
             plan.appKey = env.APP_KEY || plan.appKey;
@@ -1380,12 +1411,16 @@ export default class Install extends Command {
     }
     static buildDownloadArgvFromResults(results, options) {
         const argv = ['-y', '--no-intro'];
+        const source = String(results.source ?? '').trim();
         if (options?.verbose) {
             argv.push('--verbose');
         }
         Install.pushDownloadArgIfValue(argv, '--source', results.source);
-        Install.pushDownloadArgIfValue(argv, '--version', results.version);
-        Install.pushDownloadArgIfValue(argv, '--output-dir', results.outputDir);
+        Install.pushDownloadArgIfValue(argv, '--version', downloadResultsValue(results, 'version'));
+        Install.pushDownloadArgIfValue(argv, '--output-dir', source === 'npm' || source === 'git'
+            ? (resolveConfiguredEnvPath(results.outputDir)
+                ?? resolveConfiguredEnvPath(String(results.outputDir ?? '').trim() || defaultInstallAppRootPath(results.env)))
+            : results.outputDir);
         Install.pushDownloadArgIfValue(argv, '--git-url', results.gitUrl);
         Install.pushDownloadArgIfValue(argv, '--docker-registry', results.dockerRegistry);
         Install.pushDownloadArgIfValue(argv, '--docker-platform', results.dockerPlatform);
@@ -1415,26 +1450,49 @@ export default class Install extends Command {
         const outputDir = String(params.downloadResults.outputDir ?? '').trim()
             || String(params.appResults.appRootPath ?? '').trim()
             || defaultInstallAppRootPath(params.envName);
-        return path.resolve(process.cwd(), outputDir);
+        return resolveConfiguredEnvPath(outputDir) ?? resolveEnvRelativePath(defaultInstallAppRootPath(params.envName));
     }
-    async downloadLocalApp(params) {
+    static resolveLocalProjectConfigPath(params) {
+        return (String(params.downloadResults.outputDir ?? '').trim()
+            || String(params.appResults.appRootPath ?? '').trim()
+            || defaultInstallAppRootPath(params.envName));
+    }
+    commandStdio(verbose) {
+        return verbose ? 'inherit' : 'ignore';
+    }
+    async downloadManagedSource(params) {
         const argv = Install.buildDownloadArgvFromResults(params.downloadResults, {
             verbose: params.verbose,
         });
-        p.log.step('Downloading local NocoBase app files');
-        const result = await this.config.runCommand('download', argv);
-        const projectRoot = Install.resolveLocalProjectRoot({
+        const source = String(params.downloadResults.source ?? '').trim();
+        p.log.step(source === 'docker'
+            ? 'Downloading Docker image'
+            : 'Downloading local NocoBase app files');
+        return await this.config.runCommand('download', argv);
+    }
+    async downloadLocalApp(params) {
+        const result = await this.downloadManagedSource({
+            downloadResults: params.downloadResults,
+            verbose: params.verbose,
+        });
+        const downloadedProjectRoot = Install.resolveLocalProjectRoot({
             envName: params.envName,
             appResults: params.appResults,
             downloadResults: params.downloadResults,
             downloadCommandResult: result,
         });
-        params.appResults.appRootPath = projectRoot;
-        return projectRoot;
+        params.appResults.appRootPath = Install.resolveLocalProjectConfigPath({
+            envName: params.envName,
+            appResults: params.appResults,
+            downloadResults: params.downloadResults,
+        });
+        return downloadedProjectRoot;
     }
     static buildLocalAppEnvVars(params) {
-        const storagePath = path.resolve(String(params.appResults.storagePath ?? '').trim()
-            || defaultInstallStoragePath(params.envName));
+        const configuredStoragePath = String(params.appResults.storagePath ?? '').trim()
+            || defaultInstallStoragePath(params.envName);
+        const storagePath = resolveConfiguredEnvPath(configuredStoragePath)
+            ?? resolveEnvRelativePath(defaultInstallStoragePath(params.envName));
         const dbDialect = String(params.dbResults.dbDialect ?? 'postgres').trim()
             || 'postgres';
         const appKey = crypto.randomBytes(32).toString('hex');
@@ -1476,6 +1534,7 @@ export default class Install extends Command {
             await runNocoBaseCommand(['pm2', 'kill'], {
                 cwd: params.projectRoot,
                 env,
+                stdio: params.commandStdio ?? 'ignore',
             });
         }
         catch (error) {
@@ -1486,6 +1545,7 @@ export default class Install extends Command {
         await runNocoBaseCommand(args, {
             cwd: params.projectRoot,
             env,
+            stdio: params.commandStdio ?? 'ignore',
         });
         p.log.info(`Local app is starting at http://127.0.0.1:${env.APP_PORT}`);
         return {
@@ -1625,8 +1685,6 @@ export default class Install extends Command {
         const argv = [
             params.envName,
             '--no-intro',
-            '--scope',
-            CONFIG_SCOPE,
             '--api-base-url',
             apiBaseUrl,
             '--auth-type',
@@ -1739,7 +1797,6 @@ export default class Install extends Command {
             },
             values: {
                 name: envName,
-                scope: 'project',
                 ...(resumePreset?.envAddPreset ?? {}),
             },
             yes,
@@ -1761,6 +1818,7 @@ export default class Install extends Command {
         const parsed = {
             ...flags,
         };
+        const commandStdio = this.commandStdio(parsed.verbose);
         if (!parsed['no-intro']) {
             p.intro('Set Up NocoBase');
         }
@@ -1787,6 +1845,7 @@ export default class Install extends Command {
                 downloadResults,
                 dbResults,
                 force: parsed.force,
+                commandStdio,
             });
             dbResults.dbHost = builtinDbPlan.dbHost;
             dbResults.dbPort = builtinDbPlan.dbPort;
@@ -1799,6 +1858,10 @@ export default class Install extends Command {
         let localAppPlan;
         if (Boolean(appResults.fetchSource)) {
             if (source === 'docker') {
+                await this.downloadManagedSource({
+                    downloadResults,
+                    verbose: parsed.verbose,
+                });
                 dockerAppPlan = await this.installDockerApp({
                     envName,
                     workspaceName,
@@ -1808,6 +1871,7 @@ export default class Install extends Command {
                     rootResults,
                     builtinDbPlan,
                     force: parsed.force,
+                    commandStdio,
                 });
                 appResults.appKey = dockerAppPlan.appKey;
                 appResults.timeZone = dockerAppPlan.timeZone;
@@ -1826,6 +1890,7 @@ export default class Install extends Command {
                     appResults,
                     dbResults,
                     rootResults,
+                    commandStdio,
                 });
                 appResults.appKey = localAppPlan.appKey;
                 appResults.timeZone = localAppPlan.timeZone;
@@ -1855,5 +1920,8 @@ export default class Install extends Command {
     }
 }
 function downloadResultsValue(downloadResults, key) {
+    if (key === 'version' && String(downloadResults.version ?? '').trim() === 'other') {
+        return downloadResults.otherVersion;
+    }
     return downloadResults[key];
 }

package/dist/commands/logs.js

@@ -49,13 +49,20 @@ export default class Logs extends Command {
         if (!runtime) {
             this.error(formatMissingManagedAppEnvMessage(requestedEnv));
         }
-        if (runtime.kind === 'remote') {
+        if (runtime.kind === 'http') {
             this.error([
                 `Can't show runtime logs for "${runtime.envName}" from this machine.`,
                 'This env only has an API connection, so there is no saved local app or Docker container to read logs from.',
                 'Connect it to a local checkout or reinstall it with npm, git, or Docker if you want CLI-managed logs.',
             ].join('\n'));
         }
+        if (runtime.kind === 'ssh') {
+            this.error([
+                `Can't show runtime logs for "${runtime.envName}" yet.`,
+                'SSH env support is reserved but not implemented yet.',
+                'Use a local or Docker env for CLI-managed logs for now.',
+            ].join('\n'));
+        }
         const tail = String(flags.tail ?? 100);
         const follow = flags.follow !== false;
         printInfo(follow

package/dist/commands/pm/list.js

@@ -11,7 +11,7 @@ import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runDockerN
 export default class PmList extends Command {
     static args = {};
     static summary = 'List plugins for the selected env';
-    static description = 'List installed plugins in the selected env (npm/git runs locally, Docker runs inside the saved app container, remote envs fall back to the API)';
+    static description = 'List installed plugins in the selected env (npm/git runs locally, Docker runs inside the saved app container, HTTP envs fall back to the API)';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> -e local',
@@ -49,6 +49,13 @@ export default class PmList extends Command {
             }
             return;
         }
+        if (runtime.kind === 'ssh') {
+            this.error([
+                `Can't list plugins for "${runtime.envName}" yet.`,
+                'SSH env support is reserved but not implemented yet.',
+                'Use a local, Docker, or HTTP env for plugin inspection right now.',
+            ].join('\n'));
+        }
         await this.config.runCommand('api:pm:list', ['--mode=summary']);
     }
 }

package/dist/commands/ps.js

@@ -10,12 +10,15 @@ import { Command, Flags } from '@oclif/core';
 import { buildDockerDbContainerName, dockerContainerExists, dockerContainerIsRunning, formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, } from '../lib/app-runtime.js';
 import { listEnvs } from '../lib/auth-store.js';
 import { renderTable } from '../lib/ui.js';
+function resolveApiBaseUrl(config) {
+    return String(config.apiBaseUrl ?? config.baseUrl ?? config.apibaseUrl ?? '').trim();
+}
 function appUrl(runtime) {
     const port = String(runtime.env.config.appPort ?? '').trim();
     if (port) {
         return `http://127.0.0.1:${port}`;
     }
-    const baseUrl = String(runtime.env.config.baseUrl ?? '').trim();
+    const baseUrl = resolveApiBaseUrl(runtime.env.config);
     return baseUrl.replace(/\/api\/?$/, '');
 }
 async function isLocalAppHealthy(runtime) {
@@ -47,30 +50,30 @@ async function dockerStatus(containerName) {
 }
 async function dbStatus(runtime) {
     if (!runtime.env.config.builtinDb) {
-        return runtime.kind === 'remote' ? 'external' : '-';
+        return runtime.kind === 'http' ? 'external' : '-';
     }
-    if (runtime.kind === 'remote') {
+    if (runtime.kind === 'http') {
         return 'external';
     }
+    if (runtime.kind === 'ssh') {
+        return '-';
+    }
     const dbDialect = String(runtime.env.config.dbDialect ?? 'postgres').trim() || 'postgres';
     const containerName = buildDockerDbContainerName(runtime.envName, dbDialect, runtime.workspaceName);
     return await dockerStatus(containerName);
 }
-async function appStatus(runtime) {
-    if (runtime.kind === 'remote') {
-        return 'remote';
+async function runtimeStatus(runtime) {
+    if (runtime.kind === 'http') {
+        return 'http';
+    }
+    if (runtime.kind === 'ssh') {
+        return 'ssh';
     }
     if (runtime.kind === 'docker') {
         return await dockerStatus(runtime.containerName);
     }
     return await isLocalAppHealthy(runtime) ? 'running' : 'stopped';
 }
-function sourceLabel(runtime) {
-    if (runtime.kind === 'remote') {
-        return 'remote';
-    }
-    return runtime.source;
-}
 export default class Ps extends Command {
     static description = 'Show NocoBase runtime status for configured envs without starting or stopping anything.';
     static examples = [
@@ -105,12 +108,12 @@ export default class Ps extends Command {
             }
             rows.push([
                 runtime.envName,
-                sourceLabel(runtime),
-                await appStatus(runtime),
+                runtime.kind,
+                await runtimeStatus(runtime),
                 await dbStatus(runtime),
                 appUrl(runtime),
             ]);
         }
-        this.log(renderTable(['Env', 'Source', 'App', 'Database', 'URL'], rows));
+        this.log(renderTable(['Env', 'Kind', 'Status', 'Database', 'URL'], rows));
     }
 }

package/dist/commands/restart.js

@@ -0,0 +1,74 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { Command, Flags } from '@oclif/core';
+function argvHasToken(argv, tokens) {
+    return tokens.some((token) => argv.includes(token));
+}
+function pushFlag(argv, flag, value) {
+    if (value !== undefined) {
+        argv.push(flag, String(value));
+    }
+}
+export default class Restart extends Command {
+    static description = 'Restart NocoBase for the selected env by stopping it first, then starting it again.';
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> --env local',
+        '<%= config.bin %> <%= command.id %> --env local --quickstart',
+        '<%= config.bin %> <%= command.id %> --env local --port 12000',
+        '<%= config.bin %> <%= command.id %> --env local --daemon',
+        '<%= config.bin %> <%= command.id %> --env local --no-daemon',
+        '<%= config.bin %> <%= command.id %> --env local --instances 2',
+        '<%= config.bin %> <%= command.id %> --env local --launch-mode pm2',
+        '<%= config.bin %> <%= command.id %> --env local --verbose',
+        '<%= config.bin %> <%= command.id %> --env local-docker',
+    ];
+    static flags = {
+        env: Flags.string({
+            char: 'e',
+            description: 'CLI env name to restart. Defaults to the current env when omitted',
+        }),
+        quickstart: Flags.boolean({ description: 'Quickstart the application after stopping it', required: false }),
+        port: Flags.string({ description: 'Port (overrides appPort from env config when set)', char: 'p', required: false }),
+        daemon: Flags.boolean({
+            description: 'Run the application as a daemon after stopping it (default: true; use --no-daemon to stay in the foreground)',
+            char: 'd',
+            required: false,
+            default: true,
+            allowNo: true,
+        }),
+        instances: Flags.integer({ description: 'Number of instances to run after stopping it', char: 'i', required: false }),
+        'launch-mode': Flags.string({ description: 'Launch Mode', required: false, options: ['pm2', 'node'] }),
+        verbose: Flags.boolean({
+            description: 'Show raw shutdown/startup output from the underlying local or Docker command',
+            default: false,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(Restart);
+        const stopArgv = [];
+        const daemonFlagWasProvided = argvHasToken(this.argv, ['--daemon', '--no-daemon']);
+        pushFlag(stopArgv, '--env', flags.env?.trim() || undefined);
+        if (flags.verbose) {
+            stopArgv.push('--verbose');
+        }
+        await this.config.runCommand('stop', stopArgv);
+        const startArgv = [...stopArgv];
+        if (flags.quickstart) {
+            startArgv.push('--quickstart');
+        }
+        pushFlag(startArgv, '--port', flags.port);
+        if (daemonFlagWasProvided) {
+            startArgv.push(flags.daemon === false ? '--no-daemon' : '--daemon');
+        }
+        pushFlag(startArgv, '--instances', flags.instances);
+        pushFlag(startArgv, '--launch-mode', flags['launch-mode']);
+        await this.config.runCommand('start', startArgv);
+    }
+}

package/dist/commands/self/check.js

@@ -0,0 +1,71 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { Command, Flags } from '@oclif/core';
+import { getRecommendedSelfUpdateCommand, inspectSelfStatus, } from '../../lib/self-manager.js';
+import { printInfo, renderTable } from '../../lib/ui.js';
+export default class SelfCheck extends Command {
+    static summary = 'Check the installed NocoBase CLI version and self-update support';
+    static description = 'Inspect the current NocoBase CLI install, resolve the latest version for the selected channel, and report whether automatic self-update is supported.';
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> --channel beta',
+        '<%= config.bin %> <%= command.id %> --json',
+    ];
+    static flags = {
+        channel: Flags.string({
+            description: 'Release channel to compare against. Defaults to the current CLI channel.',
+            options: ['auto', 'latest', 'beta', 'alpha'],
+            default: 'auto',
+        }),
+        json: Flags.boolean({
+            description: 'Output the result as JSON',
+            default: false,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(SelfCheck);
+        const status = await inspectSelfStatus({
+            channel: flags.channel,
+        });
+        if (flags.json) {
+            this.log(JSON.stringify({
+                ok: true,
+                kind: 'self',
+                packageName: status.packageName,
+                currentVersion: status.currentVersion,
+                latestVersion: status.latestVersion,
+                channel: status.channel,
+                updateAvailable: status.updateAvailable,
+                installMethod: status.installMethod,
+                updatable: status.updatable,
+                updateBlockedReason: status.updateBlockedReason,
+                recommendedCommand: getRecommendedSelfUpdateCommand(status),
+                registryError: status.registryError,
+            }, null, 2));
+            return;
+        }
+        this.log(renderTable(['Field', 'Value'], [
+            ['Current version', status.currentVersion || 'unknown'],
+            ['Latest version', status.latestVersion || 'unknown'],
+            ['Channel', status.channel],
+            ['Install method', status.installMethod],
+            ['Auto-update', status.updatable ? 'supported' : 'not supported'],
+            ['Update available', status.updateAvailable ? 'yes' : 'no'],
+        ]));
+        if (status.updateAvailable && status.updatable) {
+            printInfo('Run `nb self update`.');
+        }
+        else if (status.updateAvailable && status.updateBlockedReason) {
+            printInfo(status.updateBlockedReason);
+        }
+        if (status.registryError) {
+            printInfo(`Version check warning: ${status.registryError}`);
+        }
+    }
+}