@nocobase/cli 2.1.0-beta.29 → 2.1.0-beta.30

package/dist/commands/env/status.js

@@ -0,0 +1,90 @@
+/**
+ * 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 { Args, Command, Flags } from '@oclif/core';
+import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime } from '../../lib/app-runtime.js';
+import { getCurrentEnvName, listEnvs } from '../../lib/auth-store.js';
+import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
+import { renderTable } from '../../lib/ui.js';
+import { apiStatus, runtimeStatus } from './shared.js';
+export default class EnvStatus extends Command {
+    static summary = 'Show application runtime status for the current env, one env, or all envs';
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> app1',
+        '<%= config.bin %> <%= command.id %> --all',
+        '<%= config.bin %> <%= command.id %> --all --json-output',
+    ];
+    static args = {
+        name: Args.string({
+            description: 'Configured environment name to inspect. Defaults to the current env when omitted; cannot be used with --all',
+            required: false,
+        }),
+    };
+    static flags = {
+        all: Flags.boolean({
+            description: 'Show status for all configured envs',
+            default: false,
+        }),
+        'json-output': Flags.boolean({
+            description: 'Output the result as JSON',
+            default: false,
+        }),
+    };
+    async run() {
+        const { args, flags } = await this.parse(EnvStatus);
+        const scope = resolveDefaultConfigScope();
+        const requestedEnv = args.name?.trim() || undefined;
+        if (requestedEnv && flags.all) {
+            this.error('`nb env status <name>` and `nb env status --all` cannot be used together.');
+        }
+        const { envs } = await listEnvs({ scope });
+        const configuredEnvNames = Object.keys(envs).sort();
+        if (!configuredEnvNames.length) {
+            this.log('No envs configured.');
+            this.log('Run `nb env add <name> --api-base-url <url>` to add one.');
+            return;
+        }
+        const envNames = flags.all
+            ? configuredEnvNames
+            : [requestedEnv || (await getCurrentEnvName({ scope }))];
+        const rows = [];
+        for (const envName of envNames) {
+            const runtime = await resolveManagedAppRuntime(envName);
+            if (!runtime) {
+                if (!flags.all) {
+                    this.error(formatMissingManagedAppEnvMessage(envName));
+                }
+                rows.push({
+                    env: envName,
+                    status: 'missing',
+                    apiBaseUrl: '',
+                });
+                continue;
+            }
+            const status = runtime.kind === 'http' || runtime.kind === 'ssh'
+                ? await apiStatus(envName, {
+                    ...envs[envName],
+                    ...(runtime.env.config ?? {}),
+                }, { scope })
+                : await runtimeStatus(runtime);
+            rows.push({
+                env: runtime.envName,
+                status,
+                apiBaseUrl: runtime.env.apiBaseUrl
+                    || String(runtime.env.config.apiBaseUrl ?? runtime.env.config.baseUrl ?? envs[envName]?.apiBaseUrl ?? envs[envName]?.baseUrl ?? '').trim(),
+            });
+        }
+        if (flags['json-output']) {
+            this.log(JSON.stringify(flags.all ? rows : rows[0], null, 2));
+            return;
+        }
+        const tableRows = rows.map((row) => [row.env, row.status, row.apiBaseUrl]);
+        this.log(renderTable(['Env', 'Status', 'API Base URL'], tableRows));
+    }
+}

package/dist/commands/env/update.js

@@ -22,7 +22,7 @@ export default class EnvUpdate extends Command {
     ];
     static args = {
         name: Args.string({
-            description: 'Environment name (omit to use the current env)',
+            description: 'Configured environment name to refresh. Defaults to the current env when omitted',
             required: false,
         }),
     };

package/dist/commands/env/use.js

@@ -9,6 +9,8 @@
 import { Args, Command } from '@oclif/core';
 import { setCurrentEnv } from '../../lib/auth-store.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
+import { resolveSessionIdentity } from '../../lib/session-id.js';
+import { isInteractiveTerminal, printInfo } from '../../lib/ui.js';
 export default class EnvUse extends Command {
     static summary = 'Switch the current environment';
     static examples = [
@@ -16,7 +18,7 @@ export default class EnvUse extends Command {
     ];
     static args = {
         name: Args.string({
-            description: 'Configured environment name',
+            description: 'Configured environment name to switch to',
             required: true,
         }),
     };
@@ -24,5 +26,13 @@ export default class EnvUse extends Command {
         const { args } = await this.parse(EnvUse);
         await setCurrentEnv(args.name, { scope: resolveDefaultConfigScope() });
         this.log(`Current env: ${args.name}`);
+        const identity = resolveSessionIdentity();
+        if (identity || !isInteractiveTerminal()) {
+            return;
+        }
+        this.log('Session mode is not enabled for the current shell or runtime.');
+        this.log('Without session mode, switching the current env here can affect other sessions running in parallel.');
+        this.log('');
+        printInfo('Run `nb session setup` to enable session mode for this shell or runtime.');
     }
 }

package/dist/commands/install.js

@@ -19,12 +19,13 @@ import { applyCliLocale, localeText, resolveCliLocale, translateCli, } from "../
 import { resolveConfiguredEnvPath, resolveDefaultConfigScope, resolveEnvRoot, resolveEnvRelativePath, } from '../lib/cli-home.js';
 import { defaultDockerContainerPrefix, defaultDockerNetworkName, } from '../lib/app-runtime.js';
 import { resolveDockerContainerPrefix, resolveDockerNetworkName, } from '../lib/cli-config.js';
+import { DEFAULT_DOCKER_VERSION, resolveDockerImageRef, } from "../lib/docker-image.js";
 import { findAvailableTcpPort, validateAvailableTcpPort, validateTcpPort, validateEnvKey, } from "../lib/prompt-validators.js";
 import { validateExternalDbConfig } from "../lib/db-connection-check.js";
 import { formatMissingManagedAppEnvMessage } from '../lib/app-runtime.js';
 import { run, runNocoBaseCommand } from '../lib/run-npm.js';
 import { startTask, stopTask, updateTask } from '../lib/ui.js';
-import { getEnv, upsertEnv } from '../lib/auth-store.js';
+import { getEnv, setCurrentEnv, upsertEnv } from '../lib/auth-store.js';
 import { buildStoredEnvConfig } from '../lib/env-config.js';
 import Download, { defaultDockerRegistryForLang, } from './download.js';
 import EnvAdd from "./env/add.js";
@@ -1561,7 +1562,11 @@ export default class Install extends Command {
     static buildDockerAppPlan(params) {
         const dockerRegistry = String(downloadResultsValue(params.downloadResults, 'dockerRegistry') ?? '').trim()
             || defaultDockerRegistryForLang(process.env.NB_LOCALE);
-        const version = String(downloadResultsValue(params.downloadResults, 'version') ?? '').trim() || 'latest';
+        const version = String(downloadResultsValue(params.downloadResults, 'version') ?? '').trim() || DEFAULT_DOCKER_VERSION;
+        const imageRef = resolveDockerImageRef(dockerRegistry, version, {
+            defaultRegistry: defaultDockerRegistryForLang(process.env.NB_LOCALE),
+            defaultVersion: DEFAULT_DOCKER_VERSION,
+        });
         const appPort = String(params.appResults.appPort ?? DEFAULT_INSTALL_APP_PORT).trim() || DEFAULT_INSTALL_APP_PORT;
         const storagePath = resolveConfiguredEnvPath(String(params.appResults.storagePath ?? '').trim()
             || defaultInstallStoragePath(params.envName))
@@ -1596,12 +1601,12 @@ export default class Install extends Command {
         for (const [key, value] of Object.entries(initEnvVars)) {
             args.push('-e', `${key}=${value}`);
         }
-        args.push('-e', `APP_KEY=${appKey}`, '-e', `DB_DIALECT=${dbDialect}`, '-e', `DB_HOST=${dbHost}`, '-e', `DB_PORT=${dbPort}`, '-e', `DB_DATABASE=${dbDatabase}`, '-e', `DB_USER=${dbUser}`, '-e', `DB_PASSWORD=${dbPassword}`, '-e', `TZ=${timeZone}`, '-v', `${storagePath}:/app/nocobase/storage`, `${dockerRegistry}:${version}`);
+        args.push('-e', `APP_KEY=${appKey}`, '-e', `DB_DIALECT=${dbDialect}`, '-e', `DB_HOST=${dbHost}`, '-e', `DB_PORT=${dbPort}`, '-e', `DB_DATABASE=${dbDatabase}`, '-e', `DB_USER=${dbUser}`, '-e', `DB_PASSWORD=${dbPassword}`, '-e', `TZ=${timeZone}`, '-v', `${storagePath}:/app/nocobase/storage`, imageRef);
         return {
             source: 'docker',
             networkName: params.networkName,
             containerName,
-            imageRef: `${dockerRegistry}:${version}`,
+            imageRef,
             appPort,
             storagePath,
             appKey,
@@ -1908,6 +1913,7 @@ export default class Install extends Command {
     }
     async saveInstalledEnv(params) {
         await upsertEnv(params.envName, Install.buildSavedEnvConfig(params), { scope: resolveDefaultConfigScope() });
+        await setCurrentEnv(params.envName, { scope: resolveDefaultConfigScope() });
     }
     async syncInstalledEnvConnection(params) {
         if (!params.appReady) {

package/dist/commands/license/activate.js

@@ -9,7 +9,8 @@
 import * as p from '@clack/prompts';
 import { Command, Flags } from '@oclif/core';
 import { readFile } from 'node:fs/promises';
-import { ensureInstanceId, licenseEnvFlag, licenseJsonFlag, licensePkgUrlFlag, redactLicenseKey, requireLicenseRuntime, resolveLicenseKeyFile, resolveLicenseServiceUrl, saveLicenseKey, sanitizeLicenseOutput, validateLicenseKey, } from './shared.js';
+import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
+import { createLicenseEnvFlag, ensureInstanceId, licenseJsonFlag, licensePkgUrlFlag, licenseYesFlag, redactLicenseKey, requireLicenseRuntime, resolveLicenseKeyFile, resolveLicenseServiceUrl, saveLicenseKey, sanitizeLicenseOutput, validateLicenseKey, } from './shared.js';
 import { announceTargetEnv, isInteractiveTerminal } from '../../lib/ui.js';
 import { appUrl } from '../env/shared.js';
 function resolveOnlineInputValue(value) {
@@ -114,21 +115,10 @@ async function promptOnlineActivationInput(initial) {
         p.cancel('License activation cancelled.');
         return;
     }
-    const confirmedAnswer = typeof initial.confirmed === 'boolean'
-        ? initial.confirmed
-        : await p.confirm({
-            message: 'Confirm that the submitted license information is true and accurate?',
-            initialValue: false,
-        });
-    if (p.isCancel(confirmedAnswer)) {
-        p.cancel('License activation cancelled.');
-        return;
-    }
     return {
         account,
         password,
         appName,
-        confirmed: Boolean(confirmedAnswer),
         serviceUrl: await resolveLicenseServiceUrl(initial.serviceUrl),
     };
 }
@@ -176,11 +166,12 @@ export default class LicenseActivate extends Command {
         '<%= config.bin %> <%= command.id %> --env app1 --key <licenseKey>',
         '<%= config.bin %> <%= command.id %> --env app1 --key-file ./license.txt',
         '<%= config.bin %> <%= command.id %> --env app1 --online',
+        '<%= config.bin %> <%= command.id %> --env app1 --online --account aa --password bb --desc test24',
         '<%= config.bin %> <%= command.id %> --env app1 --online --account aa --password bb --desc test24 --yes',
         '<%= config.bin %> <%= command.id %> --env app1 --json --key-file ./license.txt',
     ];
     static flags = {
-        env: licenseEnvFlag,
+        env: createLicenseEnvFlag('CLI env name to activate a license for. Defaults to the current env when omitted'),
         json: licenseJsonFlag,
         key: Flags.string({
             description: 'Existing license key to activate',
@@ -202,13 +193,23 @@ export default class LicenseActivate extends Command {
             description: 'Application name for online activation',
         }),
         'pkg-url': licensePkgUrlFlag,
-        yes: Flags.boolean({
-            description: 'Confirm that the submitted application information is true and accurate',
-            default: false,
-        }),
+        yes: licenseYesFlag,
     };
     async run() {
         const { flags } = await this.parse(LicenseActivate);
+        const requestedEnv = flags.env?.trim() || undefined;
+        const explicitEnvSelection = Boolean(requestedEnv && hasExplicitEnvSelection(this.argv ?? []));
+        if (explicitEnvSelection) {
+            const confirmed = await ensureCrossEnvConfirmed({
+                command: this,
+                requestedEnv,
+                yes: flags.yes,
+            });
+            if (!confirmed) {
+                this.log('Canceled.');
+                return;
+            }
+        }
         const runtime = await requireLicenseRuntime(flags.env);
         if (!flags.json) {
             announceTargetEnv(runtime.envName);
@@ -246,16 +247,14 @@ export default class LicenseActivate extends Command {
                 account: resolveOnlineInputValue(flags.account),
                 password: resolveOnlineInputValue(flags.password),
                 appName: resolveOnlineInputValue(flags.desc),
-                confirmed: flags.yes ? true : undefined,
                 serviceUrl: resolvedServiceUrl,
             };
             let onlineInput = initialOnline;
             if (!onlineInput.account
                 || !onlineInput.password
-                || !onlineInput.appName
-                || !onlineInput.confirmed) {
+                || !onlineInput.appName) {
                 if (!isInteractiveTerminal()) {
-                    this.error('Online activation requires --account, --password, --desc, and --yes when not using a TTY.');
+                    this.error('Online activation requires --account, --password, and --desc when not using a TTY.');
                 }
                 const prompted = await promptOnlineActivationInput(initialOnline);
                 if (!prompted) {
@@ -264,9 +263,6 @@ export default class LicenseActivate extends Command {
                 }
                 onlineInput = prompted;
             }
-            if (!onlineInput.confirmed) {
-                this.error('Online activation requires confirmation that the submitted application information is true and accurate.');
-            }
             const instanceId = await ensureInstanceId(runtime);
             const resolvedAppUrl = resolveAppUrlOrThrow(runtime);
             const resolvedKey = await requestOnlineLicenseKey(onlineInput.serviceUrl, onlineInput.account, onlineInput.password, {

package/dist/commands/license/id.js

@@ -7,7 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command, Flags } from '@oclif/core';
-import { generateAndSaveInstanceId, licenseEnvFlag, licenseJsonFlag, readSavedInstanceId, requireLicenseRuntime, resolveInstanceIdFile, } from './shared.js';
+import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
+import { createLicenseEnvFlag, generateAndSaveInstanceId, licenseJsonFlag, licenseYesFlag, readSavedInstanceId, requireLicenseRuntime, resolveInstanceIdFile, } from './shared.js';
 import { announceTargetEnv } from '../../lib/ui.js';
 export default class LicenseId extends Command {
     static summary = 'Show the instance ID for the selected env';
@@ -19,8 +20,9 @@ export default class LicenseId extends Command {
         '<%= config.bin %> <%= command.id %> --env app1 --json',
     ];
     static flags = {
-        env: licenseEnvFlag,
+        env: createLicenseEnvFlag('CLI env name to inspect. Defaults to the current env when omitted'),
         json: licenseJsonFlag,
+        yes: licenseYesFlag,
         force: Flags.boolean({
             description: 'Force regenerate the instance ID even if one is already saved',
             default: false,
@@ -28,6 +30,19 @@ export default class LicenseId extends Command {
     };
     async run() {
         const { flags } = await this.parse(LicenseId);
+        const requestedEnv = flags.env?.trim() || undefined;
+        const explicitEnvSelection = Boolean(requestedEnv && hasExplicitEnvSelection(this.argv ?? []));
+        if (explicitEnvSelection) {
+            const confirmed = await ensureCrossEnvConfirmed({
+                command: this,
+                requestedEnv,
+                yes: flags.yes,
+            });
+            if (!confirmed) {
+                this.log('Canceled.');
+                return;
+            }
+        }
         const runtime = await requireLicenseRuntime(flags.env);
         if (!flags.json) {
             announceTargetEnv(runtime.envName);

package/dist/commands/license/plugins/clean.js

@@ -8,7 +8,8 @@
  */
 import { Command, Flags } from '@oclif/core';
 import pc from 'picocolors';
-import { licenseEnvFlag, licenseJsonFlag, licensePkgUrlFlag, requireLicenseRuntime } from '../shared.js';
+import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../../lib/env-guard.js';
+import { createLicenseEnvFlag, licenseJsonFlag, licensePkgUrlFlag, licenseYesFlag, requireLicenseRuntime, } from '../shared.js';
 import { cleanLicensedPlugins } from './shared.js';
 import { resolvePluginStoragePath } from '../../../lib/plugin-storage.js';
 import { announceTargetEnv } from '../../../lib/ui.js';
@@ -31,7 +32,7 @@ export default class LicensePluginsClean extends Command {
         '<%= config.bin %> <%= command.id %> --env app1 --json',
     ];
     static flags = {
-        env: licenseEnvFlag,
+        env: createLicenseEnvFlag('CLI env name to clean licensed plugins for. Defaults to the current env when omitted'),
         json: licenseJsonFlag,
         'pkg-url': licensePkgUrlFlag,
         'dry-run': Flags.boolean({
@@ -42,9 +43,23 @@ export default class LicensePluginsClean extends Command {
             description: 'Show detailed per-plugin clean logs',
             default: false,
         }),
+        yes: licenseYesFlag,
     };
     async run() {
         const { flags } = await this.parse(LicensePluginsClean);
+        const requestedEnv = flags.env?.trim() || undefined;
+        const explicitEnvSelection = Boolean(requestedEnv && hasExplicitEnvSelection(this.argv ?? []));
+        if (explicitEnvSelection) {
+            const confirmed = await ensureCrossEnvConfirmed({
+                command: this,
+                requestedEnv,
+                yes: flags.yes,
+            });
+            if (!confirmed) {
+                this.log('Canceled.');
+                return;
+            }
+        }
         const runtime = await requireLicenseRuntime(flags.env);
         if (!flags.json) {
             announceTargetEnv(runtime.envName);

package/dist/commands/license/plugins/list.js

@@ -7,7 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command } from '@oclif/core';
-import { licenseEnvFlag, licenseJsonFlag, licensePkgUrlFlag, requireLicenseRuntime } from '../shared.js';
+import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../../lib/env-guard.js';
+import { createLicenseEnvFlag, licenseJsonFlag, licensePkgUrlFlag, licenseYesFlag, requireLicenseRuntime, } from '../shared.js';
 import { fetchLicensedPluginPackages } from './shared.js';
 import { renderTable } from '../../../lib/ui.js';
 export default class LicensePluginsList extends Command {
@@ -19,12 +20,26 @@ export default class LicensePluginsList extends Command {
         '<%= config.bin %> <%= command.id %> --env app1 --json',
     ];
     static flags = {
-        env: licenseEnvFlag,
+        env: createLicenseEnvFlag('CLI env name to inspect licensed plugins for. Defaults to the current env when omitted'),
         json: licenseJsonFlag,
         'pkg-url': licensePkgUrlFlag,
+        yes: licenseYesFlag,
     };
     async run() {
         const { flags } = await this.parse(LicensePluginsList);
+        const requestedEnv = flags.env?.trim() || undefined;
+        const explicitEnvSelection = Boolean(requestedEnv && hasExplicitEnvSelection(this.argv ?? []));
+        if (explicitEnvSelection) {
+            const confirmed = await ensureCrossEnvConfirmed({
+                command: this,
+                requestedEnv,
+                yes: flags.yes,
+            });
+            if (!confirmed) {
+                this.log('Canceled.');
+                return;
+            }
+        }
         const runtime = await requireLicenseRuntime(flags.env);
         const { commercialPlugins, licensedPlugins } = await fetchLicensedPluginPackages(runtime, {
             pkgUrl: flags['pkg-url'],

package/dist/commands/license/plugins/sync.js

@@ -10,7 +10,9 @@ import { Command, Flags } from '@oclif/core';
 import pc from 'picocolors';
 import { readFile } from 'node:fs/promises';
 import path from 'node:path';
-import { licenseEnvFlag, licenseJsonFlag, licensePkgUrlFlag, requireLicenseRuntime } from '../shared.js';
+import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_VERSION, resolveDockerImageRef, } from "../../../lib/docker-image.js";
+import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../../lib/env-guard.js';
+import { createLicenseEnvFlag, licenseJsonFlag, licensePkgUrlFlag, licenseYesFlag, requireLicenseRuntime, } from '../shared.js';
 import { syncLicensedPlugins } from './shared.js';
 import { resolvePluginStoragePath } from '../../../lib/plugin-storage.js';
 import { commandOutput } from '../../../lib/run-npm.js';
@@ -18,8 +20,6 @@ import { announceTargetEnv, startTask, stopTask, succeedTask, updateTask } from
 const SYNC_LOADING_DELAY_MS = 1200;
 const SYNC_LOADING_UPDATE_MS = 5000;
 const LOCAL_APP_PACKAGE_JSON_PATH = 'node_modules/@nocobase/app/package.json';
-const DEFAULT_DOCKER_REGISTRY = 'nocobase/nocobase';
-const DEFAULT_DOCKER_VERSION = 'alpha';
 function formatActionLabel(action) {
     switch (action) {
         case 'installed':
@@ -89,7 +89,10 @@ async function resolveLocalAppVersion(runtime) {
 }
 async function resolveDockerAppVersion(runtime) {
     const config = runtime.env.config ?? {};
-    const imageRef = `${trimValue(config.dockerRegistry) || DEFAULT_DOCKER_REGISTRY}:${trimValue(config.downloadVersion) || DEFAULT_DOCKER_VERSION}`;
+    const imageRef = resolveDockerImageRef(config.dockerRegistry, config.downloadVersion, {
+        defaultRegistry: DEFAULT_DOCKER_REGISTRY,
+        defaultVersion: DEFAULT_DOCKER_VERSION,
+    });
     const args = [
         'run',
         '--rm',
@@ -137,7 +140,7 @@ export default class LicensePluginsSync extends Command {
         '<%= config.bin %> <%= command.id %> --env app1 --json',
     ];
     static flags = {
-        env: licenseEnvFlag,
+        env: createLicenseEnvFlag('CLI env name to sync licensed plugins for. Defaults to the current env when omitted'),
         json: licenseJsonFlag,
         'pkg-url': licensePkgUrlFlag,
         'dry-run': Flags.boolean({
@@ -151,9 +154,23 @@ export default class LicensePluginsSync extends Command {
             description: 'Show detailed per-plugin sync logs',
             default: false,
         }),
+        yes: licenseYesFlag,
     };
     async run() {
         const { flags } = await this.parse(LicensePluginsSync);
+        const requestedEnv = flags.env?.trim() || undefined;
+        const explicitEnvSelection = Boolean(requestedEnv && hasExplicitEnvSelection(this.argv ?? []));
+        if (explicitEnvSelection) {
+            const confirmed = await ensureCrossEnvConfirmed({
+                command: this,
+                requestedEnv,
+                yes: flags.yes,
+            });
+            if (!confirmed) {
+                this.log('Canceled.');
+                return;
+            }
+        }
         const runtime = await requireLicenseRuntime(flags.env);
         if (!flags.json) {
             announceTargetEnv(runtime.envName);

package/dist/commands/license/shared.js

@@ -12,22 +12,28 @@ import path from 'node:path';
 import { getEnvAsync, getInstanceIdAsync, keyDecrypt } from '@nocobase/license-kit';
 import _ from 'lodash';
 import { checkExternalDbConnection, readExternalDbConnectionConfig, } from "../../lib/db-connection-check.js";
+import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_VERSION, resolveDockerImageRef, } from "../../lib/docker-image.js";
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime } from '../../lib/app-runtime.js';
 import { buildRuntimeEnvVars } from '../../lib/runtime-env-vars.js';
 import { resolveLicensePkgUrlFromConfig } from '../../lib/cli-config.js';
 import { commandOutput } from '../../lib/run-npm.js';
 import { appUrl } from '../env/shared.js';
-export const licenseEnvFlag = Flags.string({
-    char: 'e',
-    description: 'CLI env name (from `nb env` / `nb init`). Defaults to the current env when omitted',
+export function createLicenseEnvFlag(description) {
+    return Flags.string({
+        char: 'e',
+        description,
+    });
+}
+export const licenseYesFlag = Flags.boolean({
+    char: 'y',
+    description: 'Confirm using --env when it targets a different env than the current env',
+    default: false,
 });
 export const licenseJsonFlag = Flags.boolean({
     description: 'Output the result as JSON',
     default: false,
 });
 const DEFAULT_LICENSE_PKG_URL = 'https://pkg.nocobase.com/';
-const DEFAULT_DOCKER_REGISTRY = 'nocobase/nocobase';
-const DEFAULT_DOCKER_VERSION = 'alpha';
 export const licensePkgUrlFlag = Flags.string({
     description: 'Commercial package service base URL',
     hidden: true,
@@ -74,7 +80,10 @@ function normalizeDockerPlatform(value) {
 }
 function resolveDockerLicenseImageRef(runtime) {
     const config = runtime.env.config ?? {};
-    return `${trimValue(config.dockerRegistry) || DEFAULT_DOCKER_REGISTRY}:${trimValue(config.downloadVersion) || DEFAULT_DOCKER_VERSION}`;
+    return resolveDockerImageRef(config.dockerRegistry, config.downloadVersion, {
+        defaultRegistry: DEFAULT_DOCKER_REGISTRY,
+        defaultVersion: DEFAULT_DOCKER_VERSION,
+    });
 }
 function buildDockerLicenseDbFlagArgs(envVars) {
     return [

package/dist/commands/license/status.js

@@ -7,7 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command, Flags } from '@oclif/core';
-import { ensureInstanceId, licenseEnvFlag, licenseJsonFlag, requireLicenseRuntime } from './shared.js';
+import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
+import { createLicenseEnvFlag, ensureInstanceId, licenseJsonFlag, licenseYesFlag, requireLicenseRuntime } from './shared.js';
 export default class LicenseStatus extends Command {
     static summary = 'Show commercial license status for the selected env';
     static description = 'Inspect the selected env and show the current commercial licensing status. Use `--doctor` for extra diagnostic checks once the license backend wiring is implemented.';
@@ -18,8 +19,9 @@ export default class LicenseStatus extends Command {
         '<%= config.bin %> <%= command.id %> --env app1 --json',
     ];
     static flags = {
-        env: licenseEnvFlag,
+        env: createLicenseEnvFlag('CLI env name to inspect. Defaults to the current env when omitted'),
         json: licenseJsonFlag,
+        yes: licenseYesFlag,
         doctor: Flags.boolean({
             description: 'Run extra diagnostic checks and suggestions',
             default: false,
@@ -27,6 +29,19 @@ export default class LicenseStatus extends Command {
     };
     async run() {
         const { flags } = await this.parse(LicenseStatus);
+        const requestedEnv = flags.env?.trim() || undefined;
+        const explicitEnvSelection = Boolean(requestedEnv && hasExplicitEnvSelection(this.argv ?? []));
+        if (explicitEnvSelection) {
+            const confirmed = await ensureCrossEnvConfirmed({
+                command: this,
+                requestedEnv,
+                yes: flags.yes,
+            });
+            if (!confirmed) {
+                this.log('Canceled.');
+                return;
+            }
+        }
         const runtime = await requireLicenseRuntime(flags.env);
         const payload = {
             ok: true,

package/dist/commands/plugin/disable.js

@@ -8,6 +8,7 @@
  */
 import { Args, Command, Flags } from '@oclif/core';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runDockerNocoBaseCommand, runLocalNocoBaseCommand, } from '../../lib/app-runtime.js';
+import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
 import { announceTargetEnv } from '../../lib/ui.js';
 export default class PluginDisable extends Command {
     static hidden = false;
@@ -27,18 +28,36 @@ export default class PluginDisable extends Command {
     static flags = {
         env: Flags.string({
             char: 'e',
-            description: 'CLI env name (from `nb env` / `nb init`). Defaults to the current env when omitted',
+            description: 'CLI env name to disable plugins for. Defaults to the current env when omitted',
+        }),
+        yes: Flags.boolean({
+            char: 'y',
+            description: 'Confirm using --env when it targets a different env than the current env',
+            default: false,
         }),
     };
     async run() {
         const { args, flags } = await this.parse(PluginDisable);
+        const requestedEnv = flags.env?.trim() || undefined;
+        const explicitEnvSelection = Boolean(requestedEnv && hasExplicitEnvSelection(this.argv));
+        if (explicitEnvSelection) {
+            const confirmed = await ensureCrossEnvConfirmed({
+                command: this,
+                requestedEnv,
+                yes: flags.yes,
+            });
+            if (!confirmed) {
+                this.log('Canceled.');
+                return;
+            }
+        }
         const packages = args.packages;
         if (!Array.isArray(packages) || packages.length === 0) {
             this.error('Pass at least one plugin package name.');
         }
-        const runtime = await resolveManagedAppRuntime(flags.env);
+        const runtime = await resolveManagedAppRuntime(requestedEnv);
         if (!runtime) {
-            this.error(formatMissingManagedAppEnvMessage(flags.env));
+            this.error(formatMissingManagedAppEnvMessage(requestedEnv));
         }
         announceTargetEnv(runtime.envName);
         if (runtime.kind === 'local') {
@@ -61,6 +80,8 @@ export default class PluginDisable extends Command {
             }
             return;
         }
-        await this.config.runCommand('api:pm:disable', ['--await-response', '--filter-by-tk', packages.join(',')]);
+        await this.config.runCommand('api:pm:disable', explicitEnvSelection
+            ? ['--await-response', '--filter-by-tk', packages.join(','), '--env', runtime.envName, '--yes']
+            : ['--await-response', '--filter-by-tk', packages.join(',')]);
     }
 }