@nocobase/cli 2.1.0-alpha.28 → 2.1.0-alpha.29

package/dist/commands/app/down.js

@@ -97,15 +97,21 @@ function builtinDbContainerName(runtime) {
 function managedDockerNetworkName(runtime) {
     return runtime.dockerNetworkName?.trim() || runtime.workspaceName?.trim() || undefined;
 }
-async function confirmDownAll(envName, yes) {
+async function confirmDownAll(envName, yes, options) {
     if (yes) {
         return true;
     }
+    const usedCurrentEnv = options?.explicitEnv === false;
     if (!isInteractiveTerminal()) {
+        if (usedCurrentEnv) {
+            throw new Error(`\`nb app down --all\` is using the current env "${envName}". Re-run with --env ${envName} --yes to delete everything for that env in non-interactive mode.`);
+        }
         throw new Error(`\`nb app down --all\` needs confirmation. Re-run with --yes to delete everything for "${envName}" in non-interactive mode.`);
     }
     const answer = await p.confirm({
-        message: `Delete everything for "${envName}"? This removes the app, managed containers, storage data, and the saved CLI env config.`,
+        message: usedCurrentEnv
+            ? `Delete everything for current env "${envName}"? This removes the app, managed containers, storage data, and the saved CLI env config.`
+            : `Delete everything for "${envName}"? This removes the app, managed containers, storage data, and the saved CLI env config.`,
         active: 'yes',
         inactive: 'no',
         initialValue: false,
@@ -152,6 +158,7 @@ export default class AppDown extends Command {
     async run() {
         const { flags } = await this.parse(AppDown);
         const requestedEnv = flags.env?.trim() || undefined;
+        const explicitEnv = Boolean(requestedEnv);
         const removeData = Boolean(flags.all);
         const removeEnvConfig = Boolean(flags.all);
         const runtime = await resolveManagedAppRuntime(requestedEnv);
@@ -175,7 +182,7 @@ export default class AppDown extends Command {
         if (flags.all) {
             let confirmed = false;
             try {
-                confirmed = await confirmDownAll(runtime.envName, flags.yes);
+                confirmed = await confirmDownAll(runtime.envName, flags.yes, { explicitEnv });
             }
             catch (error) {
                 this.error(error instanceof Error ? error.message : String(error));

package/dist/commands/app/start.js

@@ -10,7 +10,7 @@ import { Command, Flags } from '@oclif/core';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runLocalNocoBaseCommand, startDockerContainer, } from '../../lib/app-runtime.js';
 import { AppHealthCheckError, formatAppUrl, isAppReady, resolveManagedAppApiBaseUrl, waitForAppReady, } from '../../lib/app-health.js';
 import { ensureBuiltinDbReady, ensureSavedLocalSource, recreateSavedDockerApp, } from '../../lib/app-managed-resources.js';
-import { failTask, printInfo, startTask, succeedTask } from '../../lib/ui.js';
+import { announceTargetEnv, failTask, printInfo, startTask, succeedTask } from '../../lib/ui.js';
 function argvHasToken(argv, tokens) {
     return tokens.some((token) => argv.includes(token));
 }
@@ -107,6 +107,7 @@ export default class AppStart extends Command {
                 'Use a local or Docker env if you need CLI-managed start and stop right now.',
             ].join('\n'));
         }
+        announceTargetEnv(runtime.envName);
         if (runtime.kind === 'docker') {
             const unsupportedFlags = [
                 flags.quickstart ? '--quickstart' : undefined,

package/dist/commands/app/stop.js

@@ -8,7 +8,7 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runLocalNocoBaseCommand, stopDockerContainer, } from '../../lib/app-runtime.js';
-import { failTask, startTask, succeedTask } from '../../lib/ui.js';
+import { announceTargetEnv, failTask, startTask, succeedTask } from '../../lib/ui.js';
 function formatStopFailure(envName, message) {
     if (/does not exist/i.test(message)) {
         return [
@@ -65,6 +65,7 @@ export default class AppStop extends Command {
                 'Use a local or Docker env if you need CLI-managed stop right now.',
             ].join('\n'));
         }
+        announceTargetEnv(runtime.envName);
         if (runtime.kind === 'docker') {
             startTask(`Stopping NocoBase for "${runtime.envName}"...`);
             try {

package/dist/commands/app/upgrade.js

@@ -12,7 +12,7 @@ import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runLocalNo
 import { resolveConfiguredEnvPath } from '../../lib/cli-home.js';
 import { deriveBuiltinDbConnection } from '../../lib/builtin-db.js';
 import { commandSucceeds, run } from '../../lib/run-npm.js';
-import { failTask, printInfo, startTask, stopTask, succeedTask, updateTask } from '../../lib/ui.js';
+import { announceTargetEnv, failTask, printInfo, startTask, stopTask, succeedTask, updateTask } from '../../lib/ui.js';
 const DEFAULT_DOCKER_REGISTRY = 'nocobase/nocobase';
 const DOCKER_APP_STORAGE_DESTINATION = '/app/nocobase/storage';
 const APP_HEALTH_CHECK_INTERVAL_MS = 2_000;
@@ -563,6 +563,7 @@ export default class AppUpgrade extends Command {
                 'Use a local or Docker env if you need CLI-managed upgrades right now.',
             ].join('\n'));
         }
+        announceTargetEnv(runtime.envName);
         try {
             const resolvedVersion = AppUpgrade.resolveUpgradeVersion(runtime, parsed);
             const runCommand = this.config.runCommand.bind(this.config);

package/dist/commands/db/start.js

@@ -8,7 +8,7 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { formatMissingManagedAppEnvMessage, startDockerContainer, } from '../../lib/app-runtime.js';
-import { failTask, startTask, succeedTask } from '../../lib/ui.js';
+import { announceTargetEnv, failTask, startTask, succeedTask } from '../../lib/ui.js';
 import { formatUnmanagedDbMessage, resolveDbRuntime } from './shared.js';
 function formatDbStartFailure(envName, message) {
     if (/does not exist/i.test(message)) {
@@ -52,6 +52,7 @@ export default class DbStart extends Command {
         if (runtime.kind !== 'builtin') {
             this.error(formatUnmanagedDbMessage('start', runtime));
         }
+        announceTargetEnv(runtime.envName);
         startTask(`Starting the built-in database for "${runtime.envName}"...`);
         try {
             const state = await startDockerContainer(runtime.containerName, {

package/dist/commands/db/stop.js

@@ -8,7 +8,7 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { formatMissingManagedAppEnvMessage, stopDockerContainer, } from '../../lib/app-runtime.js';
-import { failTask, startTask, succeedTask } from '../../lib/ui.js';
+import { announceTargetEnv, failTask, startTask, succeedTask } from '../../lib/ui.js';
 import { formatUnmanagedDbMessage, resolveDbRuntime } from './shared.js';
 function formatDbStopFailure(envName, message) {
     if (/does not exist/i.test(message)) {
@@ -52,6 +52,7 @@ export default class DbStop extends Command {
         if (runtime.kind !== 'builtin') {
             this.error(formatUnmanagedDbMessage('stop', runtime));
         }
+        announceTargetEnv(runtime.envName);
         startTask(`Stopping the built-in database for "${runtime.envName}"...`);
         try {
             const state = await stopDockerContainer(runtime.containerName, {

package/dist/commands/license/activate.js

@@ -10,7 +10,7 @@ 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 { isInteractiveTerminal } from '../../lib/ui.js';
+import { announceTargetEnv, isInteractiveTerminal } from '../../lib/ui.js';
 import { appUrl } from '../env/shared.js';
 function resolveOnlineInputValue(value) {
     return String(value ?? '').trim();
@@ -210,6 +210,9 @@ export default class LicenseActivate extends Command {
     async run() {
         const { flags } = await this.parse(LicenseActivate);
         const runtime = await requireLicenseRuntime(flags.env);
+        if (!flags.json) {
+            announceTargetEnv(runtime.envName);
+        }
         let key = String(flags.key ?? '').trim();
         let keyFile = String(flags['key-file'] ?? '').trim();
         let online = Boolean(flags.online);

package/dist/commands/license/generate-id.js

@@ -21,6 +21,7 @@ function formatMissingFieldsMessage(missing) {
     ].join('\n');
 }
 export default class LicenseGenerateId extends Command {
+    static hidden = true;
     static summary = 'Generate a commercial license instance ID from explicit database settings';
     static description = 'Generate the commercial licensing instance ID from explicit `--db-*` flags. This command only prints the generated ID and does not save it.';
     static examples = [

package/dist/commands/license/id.js

@@ -8,6 +8,7 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { generateAndSaveInstanceId, licenseEnvFlag, licenseJsonFlag, 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';
     static description = 'Show the commercial licensing instance ID for the selected env, generating and saving it if needed.';
@@ -28,6 +29,9 @@ export default class LicenseId extends Command {
     async run() {
         const { flags } = await this.parse(LicenseId);
         const runtime = await requireLicenseRuntime(flags.env);
+        if (!flags.json) {
+            announceTargetEnv(runtime.envName);
+        }
         const savedBefore = await readSavedInstanceId(runtime);
         const shouldGenerate = Boolean(flags.force) || !savedBefore;
         const instanceId = shouldGenerate

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

@@ -11,6 +11,7 @@ import pc from 'picocolors';
 import { licenseEnvFlag, licenseJsonFlag, licensePkgUrlFlag, requireLicenseRuntime } from '../shared.js';
 import { cleanLicensedPlugins } from './shared.js';
 import { resolvePluginStoragePath } from '../../../lib/plugin-storage.js';
+import { announceTargetEnv } from '../../../lib/ui.js';
 function formatActionLabel(action) {
     switch (action) {
         case 'removed':
@@ -38,7 +39,6 @@ export default class LicensePluginsClean extends Command {
             default: false,
         }),
         verbose: Flags.boolean({
-            char: 'V',
             description: 'Show detailed per-plugin clean logs',
             default: false,
         }),
@@ -46,6 +46,9 @@ export default class LicensePluginsClean extends Command {
     async run() {
         const { flags } = await this.parse(LicensePluginsClean);
         const runtime = await requireLicenseRuntime(flags.env);
+        if (!flags.json) {
+            announceTargetEnv(runtime.envName);
+        }
         const shouldStreamLogs = !flags.json && Boolean(flags.verbose);
         const pluginStoragePath = resolvePluginStoragePath(runtime.env.storagePath);
         if (!flags.json) {

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

@@ -14,11 +14,10 @@ import { licenseEnvFlag, licenseJsonFlag, licensePkgUrlFlag, requireLicenseRunti
 import { syncLicensedPlugins } from './shared.js';
 import { resolvePluginStoragePath } from '../../../lib/plugin-storage.js';
 import { commandOutput } from '../../../lib/run-npm.js';
-import { startTask, stopTask, succeedTask, updateTask } from '../../../lib/ui.js';
+import { announceTargetEnv, startTask, stopTask, succeedTask, updateTask } from '../../../lib/ui.js';
 const SYNC_LOADING_DELAY_MS = 1200;
 const SYNC_LOADING_UPDATE_MS = 5000;
-const LOCAL_CLI_PACKAGE_JSON_PATH = 'node_modules/@nocobase/cli/package.json';
-const DOCKER_CLI_PACKAGE_JSON_PATH = '/opt/nb/node_modules/@nocobase/cli/package.json';
+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) {
@@ -78,13 +77,13 @@ async function parseVersionFromPackageJson(content, sourceLabel) {
     return version;
 }
 async function resolveLocalAppVersion(runtime) {
-    const packageJsonPath = path.join(runtime.projectRoot, LOCAL_CLI_PACKAGE_JSON_PATH);
+    const packageJsonPath = path.join(runtime.projectRoot, LOCAL_APP_PACKAGE_JSON_PATH);
     let content;
     try {
         content = await readFile(packageJsonPath, 'utf8');
     }
     catch {
-        throw new Error(`Missing ${LOCAL_CLI_PACKAGE_JSON_PATH} for env "${runtime.envName}" at ${packageJsonPath}.`);
+        throw new Error(`Missing ${LOCAL_APP_PACKAGE_JSON_PATH} for env "${runtime.envName}" at ${packageJsonPath}.`);
     }
     return await parseVersionFromPackageJson(content, packageJsonPath);
 }
@@ -101,7 +100,7 @@ async function resolveDockerAppVersion(runtime) {
     if (dockerPlatform) {
         args.push('--platform', dockerPlatform);
     }
-    args.push('--entrypoint', 'node', imageRef, '-p', `JSON.stringify(require(${JSON.stringify(DOCKER_CLI_PACKAGE_JSON_PATH)}).version)`);
+    args.push('--entrypoint', 'nb', imageRef, '--version');
     let output;
     try {
         output = await commandOutput('docker', args, {
@@ -110,11 +109,12 @@ async function resolveDockerAppVersion(runtime) {
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        throw new Error(`Missing ${DOCKER_CLI_PACKAGE_JSON_PATH} for env "${runtime.envName}" inside Docker image ${imageRef}. ${message}`);
+        throw new Error(`Failed to read app version for env "${runtime.envName}" from Docker image ${imageRef}. ${message}`);
     }
-    const version = trimValue(output.replace(/^"+|"+$/g, ''));
+    const versionMatch = output.match(/@nocobase\/cli\/([^\s]+)/);
+    const version = trimValue(versionMatch?.[1] ?? output.replace(/^"+|"+$/g, ''));
     if (!version) {
-        throw new Error(`Missing version in ${DOCKER_CLI_PACKAGE_JSON_PATH} for env "${runtime.envName}" inside Docker image ${imageRef}.`);
+        throw new Error(`Missing app version for env "${runtime.envName}" inside Docker image ${imageRef}.`);
     }
     return version;
 }
@@ -148,7 +148,6 @@ export default class LicensePluginsSync extends Command {
             description: 'Registry version or dist-tag to synchronize. Defaults to the current workspace version.',
         }),
         verbose: Flags.boolean({
-            char: 'V',
             description: 'Show detailed per-plugin sync logs',
             default: false,
         }),
@@ -156,6 +155,9 @@ export default class LicensePluginsSync extends Command {
     async run() {
         const { flags } = await this.parse(LicensePluginsSync);
         const runtime = await requireLicenseRuntime(flags.env);
+        if (!flags.json) {
+            announceTargetEnv(runtime.envName);
+        }
         const version = trimValue(flags.version) || await resolveManagedAppVersion(runtime);
         const registryVersion = normalizePluginRegistryVersion(version);
         const shouldStreamLogs = !flags.json && Boolean(flags.verbose);

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 { announceTargetEnv } from '../../lib/ui.js';
 export default class PluginDisable extends Command {
     static hidden = false;
     static args = {
@@ -39,6 +40,7 @@ export default class PluginDisable extends Command {
         if (!runtime) {
             this.error(formatMissingManagedAppEnvMessage(flags.env));
         }
+        announceTargetEnv(runtime.envName);
         if (runtime.kind === 'local') {
             try {
                 await runLocalNocoBaseCommand(runtime, ['pm', 'disable', ...packages]);

package/dist/commands/plugin/enable.js

@@ -8,6 +8,7 @@
  */
 import { Args, Command, Flags } from '@oclif/core';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runDockerNocoBaseCommand, runLocalNocoBaseCommand, } from '../../lib/app-runtime.js';
+import { announceTargetEnv } from '../../lib/ui.js';
 export default class PluginEnable extends Command {
     static hidden = false;
     static args = {
@@ -39,6 +40,7 @@ export default class PluginEnable extends Command {
         if (!runtime) {
             this.error(formatMissingManagedAppEnvMessage(flags.env));
         }
+        announceTargetEnv(runtime.envName);
         if (runtime.kind === 'local') {
             try {
                 await runLocalNocoBaseCommand(runtime, ['pm', 'enable', ...packages]);

package/dist/commands/source/dev.js

@@ -8,7 +8,7 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runLocalNocoBaseCommand, } from '../../lib/app-runtime.js';
-import { printInfo } from '../../lib/ui.js';
+import { announceTargetEnv, printInfo } from '../../lib/ui.js';
 function formatUnsupportedRuntimeMessage(kind, envName) {
     if (kind === 'docker') {
         return [
@@ -110,6 +110,7 @@ export default class SourceDev extends Command {
         if (runtime.kind === 'docker' || runtime.kind === 'http' || runtime.kind === 'ssh') {
             this.error(formatUnsupportedRuntimeMessage(runtime.kind, runtime.envName));
         }
+        announceTargetEnv(runtime.envName);
         const devPort = flags.port
             || (runtime.env.appPort !== undefined && runtime.env.appPort !== null
                 ? String(runtime.env.appPort).trim()

package/dist/lib/bootstrap.js

@@ -36,14 +36,10 @@ function hasBooleanFlag(argv, name) {
     const exact = `--${name}`;
     const negated = `--no-${name}`;
     const prefix = `--${name}=`;
-    const alias = name === 'verbose' ? '-V' : undefined;
     for (const value of argv) {
         if (value === exact) {
             return true;
         }
-        if (alias && value === alias) {
-            return true;
-        }
         if (value === negated) {
             return false;
         }

package/dist/lib/ui.js

@@ -88,6 +88,9 @@ export function printInfo(message) {
     }
     console.log(pc.cyan(message));
 }
+export function announceTargetEnv(envName) {
+    printInfo(`Target env: ${envName}`);
+}
 export function printVerbose(message) {
     if (!verboseMode) {
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.0-alpha.28",
+  "version": "2.1.0-alpha.29",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -103,5 +103,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "e38293c4a1ce4d043d2b17a3067fd4f0341a7a2d"
+  "gitHead": "526e36e399a570755286f9a0d34fa202b4a58a03"
 }