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

package/README.md

@@ -296,6 +296,20 @@ Show the current env:
 nb env
 ```
 
+Show only the current env name:
+
+```bash
+nb env current
+```
+
+Set up shell session integration for `NB_SESSION_ID`:
+
+```bash
+nb session setup
+nb session id
+nb session remove
+```
+
 List configured envs with token-verified API status:
 
 ```bash

package/README.zh-CN.md

@@ -256,6 +256,20 @@ nb app down --env app1 --all --yes
 nb env
 ```
 
+只查看当前 env 名称：
+
+```bash
+nb env current
+```
+
+配置 `NB_SESSION_ID` 的 shell session 集成：
+
+```bash
+nb session setup
+nb session id
+nb session remove
+```
+
 查看已配置的 env 及 Token 验证后的 API 状态：
 
 ```bash

package/bin/run.js

@@ -5,6 +5,7 @@ import fs from 'node:fs';
 import { createRequire } from 'node:module';
 import path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
+import { normalizeSessionEnv } from './session-env.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const requireFromCli = createRequire(import.meta.url);
@@ -16,6 +17,8 @@ if (process.env.NB_CLI_USE_DIST === '1') {
   isDev = false;
 }
 
+normalizeSessionEnv();
+
 /**
  * In the monorepo, plain `node` cannot load `.ts`. Re-exec once with `--import <tsx>`
  * (same effect as a dedicated dev entry with `#!/usr/bin/env -S node --import tsx`).

package/bin/session-env.js

@@ -0,0 +1,27 @@
+const SESSION_ENV_SOURCES = [
+  'CODEX_THREAD_ID',
+  'OPENCODE_RUN_ID',
+  'COPILOT_AGENT_SESSION_ID',
+  'CLAUDE_CODE_SESSION_ID',
+];
+
+export function resolveNormalizedSessionId(env = process.env) {
+  for (const key of SESSION_ENV_SOURCES) {
+    const value = String(env[key] ?? '').trim();
+    if (value) {
+      return value;
+    }
+  }
+
+  return undefined;
+}
+
+export function normalizeSessionEnv(env = process.env) {
+  const sessionId = resolveNormalizedSessionId(env);
+  if (!sessionId) {
+    return undefined;
+  }
+
+  env.NB_SESSION_ID = sessionId;
+  return sessionId;
+}

package/dist/commands/app/down.js

@@ -12,8 +12,9 @@ import fsp from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import { buildDockerDbContainerName, formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runLocalNocoBaseCommand, } from '../../lib/app-runtime.js';
-import { removeEnv } from '../../lib/auth-store.js';
+import { getCurrentEnvName, removeEnv } from '../../lib/auth-store.js';
 import { resolveConfiguredEnvPath } from '../../lib/cli-home.js';
+import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
 import { commandOutput, commandSucceeds, run } from '../../lib/run-npm.js';
 import { failTask, isInteractiveTerminal, printInfo, startTask, succeedTask, } from '../../lib/ui.js';
 function resolveConfiguredPath(value) {
@@ -97,16 +98,16 @@ function builtinDbContainerName(runtime) {
 function managedDockerNetworkName(runtime) {
     return runtime.dockerNetworkName?.trim() || runtime.workspaceName?.trim() || undefined;
 }
-async function confirmDownAll(envName, yes, options) {
-    if (yes) {
+async function confirmDownAll(envName, force, options) {
+    if (force) {
         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\` is using the current env "${envName}". Re-run with --env ${envName} --force 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.`);
+        throw new Error(`\`nb app down --all\` needs confirmation. Re-run with --force to delete everything for "${envName}" in non-interactive mode.`);
     }
     const answer = await p.confirm({
         message: usedCurrentEnv
@@ -122,6 +123,17 @@ async function confirmDownAll(envName, yes, options) {
     }
     return answer;
 }
+function formatDownCrossEnvForceRequiredMessage(currentEnv, requestedEnv) {
+    return [
+        `Refusing to run against env "${requestedEnv}" because the current env is "${currentEnv}" and interactive confirmation is unavailable in the current agent session.`,
+        '',
+        'For safety, the agent will not switch envs automatically and will not add --force on your behalf.',
+        '',
+        'To continue:',
+        `- run \`nb env use ${requestedEnv}\` yourself and then re-run the command, or`,
+        `- re-run the same command with \`--env ${requestedEnv} --force\` to confirm this one-off cross-env operation.`,
+    ].join('\n');
+}
 function formatDownFailure(envName, message) {
     return [
         `Couldn't bring down NocoBase for "${envName}".`,
@@ -134,7 +146,8 @@ export default class AppDown extends Command {
     static description = 'Bring down the selected env by removing runtime containers and the saved local app files. Storage data and env config are kept unless explicitly requested.';
     static examples = [
         '<%= config.bin %> <%= command.id %> --env app1',
-        '<%= config.bin %> <%= command.id %> --env app1 --all --yes',
+        '<%= config.bin %> <%= command.id %> --env app1 --all --force',
+        '<%= config.bin %> <%= command.id %> --env app1 --force',
     ];
     static flags = {
         env: Flags.string({
@@ -147,7 +160,12 @@ export default class AppDown extends Command {
         }),
         yes: Flags.boolean({
             char: 'y',
-            description: 'Confirm destructive actions without prompting',
+            description: 'Confirm using --env when it targets a different env than the current env',
+            default: false,
+        }),
+        force: Flags.boolean({
+            char: 'f',
+            description: 'Force a one-off cross-env operation when --env targets a different env in non-interactive mode',
             default: false,
         }),
         verbose: Flags.boolean({
@@ -158,6 +176,26 @@ export default class AppDown extends Command {
     async run() {
         const { flags } = await this.parse(AppDown);
         const requestedEnv = flags.env?.trim() || undefined;
+        if (requestedEnv && hasExplicitEnvSelection(this.argv)) {
+            if (!isInteractiveTerminal()) {
+                const currentEnv = await getCurrentEnvName();
+                const normalizedCurrentEnv = String(currentEnv ?? '').trim() || undefined;
+                if (normalizedCurrentEnv && normalizedCurrentEnv !== requestedEnv && !flags.force) {
+                    this.error(formatDownCrossEnvForceRequiredMessage(normalizedCurrentEnv, requestedEnv));
+                }
+            }
+            else {
+                const confirmed = await ensureCrossEnvConfirmed({
+                    command: this,
+                    requestedEnv,
+                    yes: flags.yes,
+                });
+                if (!confirmed) {
+                    this.log('Canceled.');
+                    return;
+                }
+            }
+        }
         const explicitEnv = Boolean(requestedEnv);
         const removeData = Boolean(flags.all);
         const removeEnvConfig = Boolean(flags.all);
@@ -182,7 +220,7 @@ export default class AppDown extends Command {
         if (flags.all) {
             let confirmed = false;
             try {
-                confirmed = await confirmDownAll(runtime.envName, flags.yes, { explicitEnv });
+                confirmed = await confirmDownAll(runtime.envName, flags.force, { explicitEnv });
             }
             catch (error) {
                 this.error(error instanceof Error ? error.message : String(error));
@@ -255,7 +293,7 @@ export default class AppDown extends Command {
             if (removeEnvConfig) {
                 startTask(`Removing saved CLI env config for "${runtime.envName}"...`);
                 const result = await removeEnv(runtime.envName);
-                succeedTask(`Saved CLI env config removed for "${runtime.envName}"${result.currentEnv ? ` (current env: ${result.currentEnv})` : ''}.`);
+                succeedTask(`Saved CLI env config removed for "${runtime.envName}"${result.lastEnv ? ` (last env: ${result.lastEnv})` : ''}.`);
             }
         }
         catch (error) {

package/dist/commands/app/logs.js

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command, Flags } from '@oclif/core';
+import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runLocalNocoBaseCommand, } from '../../lib/app-runtime.js';
 import { run } from '../../lib/run-npm.js';
 import { printInfo } from '../../lib/ui.js';
@@ -31,6 +32,11 @@ export default class AppLogs extends Command {
             char: 'e',
             description: 'CLI env name to inspect logs 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,
+        }),
         tail: Flags.integer({
             description: 'Number of recent log lines to show before following',
             default: 100,
@@ -46,6 +52,17 @@ export default class AppLogs extends Command {
     async run() {
         const { flags } = await this.parse(AppLogs);
         const requestedEnv = flags.env?.trim() || undefined;
+        if (requestedEnv && hasExplicitEnvSelection(this.argv)) {
+            const confirmed = await ensureCrossEnvConfirmed({
+                command: this,
+                requestedEnv,
+                yes: flags.yes,
+            });
+            if (!confirmed) {
+                this.log('Canceled.');
+                return;
+            }
+        }
         const runtime = await resolveManagedAppRuntime(requestedEnv);
         if (!runtime) {
             this.error(formatMissingManagedAppEnvMessage(requestedEnv));

package/dist/commands/app/restart.js

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command, Flags } from '@oclif/core';
+import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
 function argvHasToken(argv, tokens) {
     return tokens.some((token) => argv.includes(token));
 }
@@ -35,6 +36,11 @@ export default class AppRestart extends Command {
             char: 'e',
             description: 'CLI env name to restart. 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,
+        }),
         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({
@@ -53,9 +59,25 @@ export default class AppRestart extends Command {
     };
     async run() {
         const { flags } = await this.parse(AppRestart);
+        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 stopArgv = [];
         const daemonFlagWasProvided = argvHasToken(this.argv, ['--daemon', '--no-daemon']);
-        pushFlag(stopArgv, '--env', flags.env?.trim() || undefined);
+        pushFlag(stopArgv, '--env', requestedEnv);
+        if (flags.yes || explicitEnvSelection) {
+            stopArgv.push('--yes');
+        }
         if (flags.verbose) {
             stopArgv.push('--verbose');
         }

package/dist/commands/app/start.js

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command, Flags } from '@oclif/core';
+import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
 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';
@@ -68,6 +69,11 @@ export default class AppStart extends Command {
             char: 'e',
             description: 'CLI env name to start. 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,
+        }),
         quickstart: Flags.boolean({ description: 'Quickstart the application', required: false }),
         port: Flags.string({ description: 'Port (overrides appPort from env config when set)', char: 'p', required: false }),
         daemon: Flags.boolean({
@@ -87,6 +93,17 @@ export default class AppStart extends Command {
     async run() {
         const { flags } = await this.parse(AppStart);
         const requestedEnv = flags.env?.trim() || undefined;
+        if (requestedEnv && hasExplicitEnvSelection(this.argv)) {
+            const confirmed = await ensureCrossEnvConfirmed({
+                command: this,
+                requestedEnv,
+                yes: flags.yes,
+            });
+            if (!confirmed) {
+                this.log('Canceled.');
+                return;
+            }
+        }
         const daemonFlagWasProvided = argvHasToken(this.argv, ['--daemon', '--no-daemon']);
         const runtime = await resolveManagedAppRuntime(requestedEnv);
         const commandStdio = flags.verbose ? 'inherit' : 'ignore';

package/dist/commands/app/stop.js

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command, Flags } from '@oclif/core';
+import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runLocalNocoBaseCommand, stopDockerContainer, } from '../../lib/app-runtime.js';
 import { announceTargetEnv, failTask, startTask, succeedTask } from '../../lib/ui.js';
 function formatStopFailure(envName, message) {
@@ -38,6 +39,11 @@ export default class AppStop extends Command {
             char: 'e',
             description: 'CLI env name to stop. 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,
+        }),
         verbose: Flags.boolean({
             description: 'Show raw shutdown output from the underlying local or Docker command',
             default: false,
@@ -46,6 +52,17 @@ export default class AppStop extends Command {
     async run() {
         const { flags } = await this.parse(AppStop);
         const requestedEnv = flags.env?.trim() || undefined;
+        if (requestedEnv && hasExplicitEnvSelection(this.argv)) {
+            const confirmed = await ensureCrossEnvConfirmed({
+                command: this,
+                requestedEnv,
+                yes: flags.yes,
+            });
+            if (!confirmed) {
+                this.log('Canceled.');
+                return;
+            }
+        }
         const runtime = await resolveManagedAppRuntime(requestedEnv);
         const commandStdio = flags.verbose ? 'inherit' : 'ignore';
         if (!runtime) {

package/dist/commands/app/upgrade.js

@@ -11,9 +11,10 @@ import { upsertEnv } from '../../lib/auth-store.js';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runLocalNocoBaseCommand, startDockerContainer, stopDockerContainer, } from '../../lib/app-runtime.js';
 import { resolveConfiguredEnvPath } from '../../lib/cli-home.js';
 import { deriveBuiltinDbConnection } from '../../lib/builtin-db.js';
+import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
+import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_VERSION, resolveDockerImageRef, } from "../../lib/docker-image.js";
 import { commandSucceeds, run } from '../../lib/run-npm.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;
 const APP_HEALTH_CHECK_TIMEOUT_MS = 600_000;
@@ -211,6 +212,11 @@ export default class AppUpgrade extends Command {
             char: 'e',
             description: 'CLI env name to upgrade. 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,
+        }),
         'skip-code-update': Flags.boolean({
             char: 's',
             description: 'Restart with the saved local code or Docker image without downloading updates first',
@@ -355,7 +361,10 @@ export default class AppUpgrade extends Command {
         if (missing.length > 0) {
             throw new Error(`The saved Docker settings for "${runtime.envName}" are incomplete. Missing: ${missing.join(', ')}. Re-run \`nb init\` or \`nb env add\` to refresh this env config.`);
         }
-        const imageRef = `${dockerRegistry}:${downloadVersion}`;
+        const imageRef = resolveDockerImageRef(dockerRegistry, downloadVersion, {
+            defaultRegistry: DEFAULT_DOCKER_REGISTRY,
+            defaultVersion: DEFAULT_DOCKER_VERSION,
+        });
         const args = [
             'run',
             '-d',
@@ -544,6 +553,17 @@ export default class AppUpgrade extends Command {
         const { flags } = await this.parse(AppUpgrade);
         const parsed = flags;
         const requestedEnv = parsed.env?.trim() || undefined;
+        if (requestedEnv && hasExplicitEnvSelection(this.argv)) {
+            const confirmed = await ensureCrossEnvConfirmed({
+                command: this,
+                requestedEnv,
+                yes: parsed.yes,
+            });
+            if (!confirmed) {
+                this.log('Canceled.');
+                return;
+            }
+        }
         const commandStdio = parsed.verbose ? 'inherit' : 'ignore';
         const runtime = await resolveManagedAppRuntime(requestedEnv);
         if (!runtime) {

package/dist/commands/db/check.js

@@ -10,10 +10,9 @@ import { Command, Flags } from '@oclif/core';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime } from '../../lib/app-runtime.js';
 import { resolveBuiltinDbConnection } from '../../lib/builtin-db.js';
 import { checkExternalDbConnection, formatDbCheckAddress, readExternalDbConnectionConfig, } from "../../lib/db-connection-check.js";
+import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_VERSION, resolveDockerImageRef, } from "../../lib/docker-image.js";
 import { commandOutput } from '../../lib/run-npm.js';
 import { validateTcpPort } from "../../lib/prompt-validators.js";
-const DEFAULT_DOCKER_REGISTRY = 'nocobase/nocobase';
-const DEFAULT_DOCKER_VERSION = 'alpha';
 function trimValue(value) {
     const text = String(value ?? '').trim();
     return text || undefined;
@@ -133,7 +132,10 @@ async function runExplicitDbCheck(command, dbConfig) {
 async function runDockerDbCheck(command, runtime, dbConfig) {
     const connectionConfig = buildConnectionConfigOrThrow(command, dbConfig);
     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',
@@ -185,7 +187,7 @@ export default class DbCheck extends Command {
     static flags = {
         env: Flags.string({
             char: 'e',
-            description: 'CLI env name to read saved database settings from. Defaults to the current env when omitted.',
+            description: 'CLI env name to read saved database settings from. Defaults to the current env when omitted',
         }),
         'db-dialect': Flags.string({
             description: 'Database dialect: postgres, kingbase, mysql, or mariadb.',

package/dist/commands/db/ps.js

@@ -20,7 +20,7 @@ export default class DbPs extends Command {
     static flags = {
         env: Flags.string({
             char: 'e',
-            description: 'CLI env name to inspect. Omit to show all configured envs',
+            description: 'CLI env name to inspect built-in database status for. Omit to show all configured envs',
         }),
     };
     async run() {

package/dist/commands/env/add.js

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Args, Command, Flags } from '@oclif/core';
-import { upsertEnv } from '../../lib/auth-store.js';
+import { setCurrentEnv, upsertEnv } from '../../lib/auth-store.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { buildStoredEnvConfig, } from '../../lib/env-config.js';
 import { runPromptCatalog, } from '../../lib/prompt-catalog.js';
@@ -55,7 +55,7 @@ export default class EnvAdd extends Command {
     ];
     static args = {
         name: Args.string({
-            description: 'Label for this environment (optional first argument; in a TTY, prompted when omitted; required when not using a TTY)',
+            description: 'Environment name to save (optional first argument; in a TTY, prompted when omitted; required when not using a TTY)',
             required: false,
         }),
     };
@@ -303,6 +303,7 @@ export default class EnvAdd extends Command {
         const envConfig = this.buildEnvConfig(results, parsedFlags);
         printVerbose(`Saving env "${envName}" globally.`);
         await upsertEnv(envName, envConfig, { scope: resolveDefaultConfigScope() });
+        await setCurrentEnv(envName, { scope: resolveDefaultConfigScope() });
         if (results.authType === 'oauth') {
             await this.config.runCommand('env:auth', [envName]);
         }

package/dist/commands/env/auth.js

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

package/dist/commands/env/current.js

@@ -0,0 +1,21 @@
+/**
+ * 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 } from '@oclif/core';
+import { getCurrentEnvName } from '../../lib/auth-store.js';
+import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
+export default class EnvCurrent extends Command {
+    static summary = 'Show the current environment name';
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+    ];
+    async run() {
+        await this.parse(EnvCurrent);
+        this.log(await getCurrentEnvName({ scope: resolveDefaultConfigScope() }));
+    }
+}

package/dist/commands/env/info.js

@@ -50,18 +50,19 @@ export default class EnvInfo extends Command {
         '<%= config.bin %> <%= command.id %> app1',
         '<%= config.bin %> <%= command.id %> app1 --json',
         '<%= config.bin %> <%= command.id %> app1 --show-secrets',
-        '<%= config.bin %> <%= command.id %> --env app1',
     ];
     static args = {
         name: Args.string({
-            description: 'CLI env name to inspect. Defaults to the current env when omitted',
+            description: 'Configured environment name to inspect. Defaults to the current env when omitted',
             required: false,
         }),
     };
     static flags = {
         env: Flags.string({
             char: 'e',
-            description: 'CLI env name to inspect. Defaults to the current env when omitted',
+            hidden: true,
+            deprecated: true,
+            description: 'Environment name (same as the optional positional argument; for compatibility with -e/--env on other commands)',
         }),
         json: Flags.boolean({
             description: 'Output the result as JSON',

package/dist/commands/env/list.js

@@ -7,20 +7,20 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command } from '@oclif/core';
-import { resolveManagedAppRuntime } from '../../lib/app-runtime.js';
-import { listEnvs } from '../../lib/auth-store.js';
+import { getCurrentEnvName, listEnvs } from '../../lib/auth-store.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { renderTable } from '../../lib/ui.js';
-import { apiStatus, appUrl, resolveApiBaseUrl } from './shared.js';
+import { resolveApiBaseUrl } from './shared.js';
 export default class EnvList extends Command {
-    static summary = 'List configured environments and API auth status';
+    static summary = 'List configured environments';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
     ];
     async run() {
         await this.parse(EnvList);
         const scope = resolveDefaultConfigScope();
-        const { currentEnv, envs } = await listEnvs({ scope });
+        const { envs } = await listEnvs({ scope });
+        const currentEnv = await getCurrentEnvName({ scope });
         const names = Object.keys(envs).sort();
         if (!names.length) {
             this.log('No envs configured.');
@@ -30,21 +30,15 @@ export default class EnvList extends Command {
         const rows = [];
         for (const name of names) {
             const env = envs[name];
-            const runtime = await resolveManagedAppRuntime(name);
-            const statusConfig = {
-                ...env,
-                ...(runtime?.env.config ?? {}),
-            };
             rows.push([
                 name === currentEnv ? '*' : '',
                 name,
-                runtime?.kind ?? env.kind ?? '-',
-                await apiStatus(name, statusConfig, { scope }),
-                runtime ? appUrl(runtime) : resolveApiBaseUrl(env),
+                env.kind ?? '-',
+                resolveApiBaseUrl(env),
                 env.auth?.type ?? '',
                 env.runtime?.version ?? '',
             ]);
         }
-        this.log(renderTable(['Current', 'Name', 'Kind', 'App Status', 'URL', 'Auth', 'Runtime'], rows));
+        this.log(renderTable(['Current', 'Name', 'Kind', 'API Base URL', 'Auth', 'Runtime'], rows));
     }
 }

package/dist/commands/env/remove.js

@@ -29,7 +29,7 @@ export default class EnvRemove extends Command {
     };
     static args = {
         name: Args.string({
-            description: 'Configured environment name',
+            description: 'Configured environment name to remove',
             required: true,
         }),
     };
@@ -51,7 +51,7 @@ export default class EnvRemove extends Command {
         const result = await removeEnv(args.name, { scope: resolveDefaultConfigScope() });
         this.log(`Removed env "${result.removed}".`);
         if (result.hasEnvs) {
-            this.log(`Current env: ${result.currentEnv}`);
+            this.log(`Current env: ${await getCurrentEnvName({ scope: resolveDefaultConfigScope() })}`);
             return;
         }
         this.log('No envs configured.');