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

package/README.md

@@ -58,7 +58,7 @@ nb init --ui
 
 `nb init` can either connect to an existing NocoBase app or install a new one.
 When creating a new app, it can also install NocoBase AI coding skills
-(`nocobase/skills`) for the current workspace.
+(`nocobase/skills`) globally.
 
 ### Non-Interactive Setup
 
@@ -138,6 +138,7 @@ In non-interactive mode, pass these setup-only flags again because they are not
 | `nb download` | Advanced command used by `nb init` or `nb upgrade` to fetch NocoBase from Docker, npm, or Git. It is rarely used directly. |
 | `nb start` | Start the selected local app or Docker container. |
 | `nb stop` | Stop the selected local app or Docker container. |
+| `nb restart` | Stop, then start the selected local app or Docker container. |
 | `nb dev` | Run development mode for npm/Git source envs. |
 | `nb logs` | Show app logs for npm/Git or Docker envs. |
 | `nb ps` | Show runtime status for configured envs. |
@@ -147,11 +148,14 @@ In non-interactive mode, pass these setup-only flags again because they are not
 | `nb env` | Manage saved CLI env connections. |
 | `nb api` | Call NocoBase API resources from the CLI. |
 | `nb pm` | Manage plugins for the selected NocoBase env. |
+| `nb self` | Check or update the installed NocoBase CLI. |
+| `nb skills` | Check, install, or update global NocoBase AI coding skills. |
 
 Recommended style: use `--env` explicitly for app/runtime commands. `-e` is the short form:
 
 ```bash
 nb start --env app1
+nb restart --env app1
 nb logs --env app1
 nb ps --env app1
 nb db ps --env app1
@@ -161,11 +165,41 @@ Equivalent shorthand examples:
 
 ```bash
 nb start -e app1
+nb restart -e app1
 nb logs -e app1
 nb upgrade -e app1
 nb db start -e app1
 ```
 
+## CLI And Skills Updates
+
+Check whether the installed CLI itself is up to date:
+
+```bash
+nb self check
+nb self check --json
+```
+
+Update the CLI when it is installed globally with npm:
+
+```bash
+nb self update
+```
+
+Check whether the global NocoBase AI coding skills are installed:
+
+```bash
+nb skills check
+nb skills check --json
+```
+
+Install the skills for the first time, or update an existing `nocobase/skills` install:
+
+```bash
+nb skills install
+nb skills update
+```
+
 ## Runtime Types
 
 ### Docker
@@ -175,6 +209,7 @@ Docker envs are managed through saved Docker containers and images:
 ```bash
 nb init --env app1 --yes --source docker --version alpha
 nb start --env app1
+nb restart --env app1
 nb logs --env app1
 nb stop --env app1
 ```
@@ -205,7 +240,7 @@ To connect an existing app, use `nb init` and choose the existing-app setup
 path, or add the env directly:
 
 ```bash
-nb env add app1 --base-url http://localhost:13000/api
+nb env add app1 --api-base-url http://localhost:13000/api
 ```
 
 `nb env add` will start the authentication flow automatically when needed.

package/README.zh-CN.md

@@ -53,7 +53,7 @@ nb init
 nb init --ui
 ```
 
-`nb init` 可以连接已有的 NocoBase 应用，也可以安装一个新的 NocoBase 应用。创建新应用时，还可以为当前工作区安装 NocoBase AI coding skills (`nocobase/skills`)。
+`nb init` 可以连接已有的 NocoBase 应用，也可以安装一个新的 NocoBase 应用。创建新应用时，还可以全局安装 NocoBase AI coding skills (`nocobase/skills`)。
 
 ### 非交互式初始化
 
@@ -133,6 +133,7 @@ nb install --env app1 --resume
 | `nb download` | `nb init` 或 `nb upgrade` 会使用的高级命令，用于从 Docker、npm 或 Git 获取 NocoBase。通常很少直接使用。 |
 | `nb start` | 启动选中的本地应用或 Docker 容器。 |
 | `nb stop` | 停止选中的本地应用或 Docker 容器。 |
+| `nb restart` | 先停止，再启动选中的本地应用或 Docker 容器。 |
 | `nb dev` | 为 npm/Git 源码 env 启动开发模式。 |
 | `nb logs` | 查看 npm/Git 或 Docker env 的应用日志。 |
 | `nb ps` | 查看已配置 env 的运行状态。 |
@@ -147,6 +148,7 @@ nb install --env app1 --resume
 
 ```bash
 nb start --env app1
+nb restart --env app1
 nb logs --env app1
 nb ps --env app1
 nb db ps --env app1
@@ -156,6 +158,7 @@ nb db ps --env app1
 
 ```bash
 nb start -e app1
+nb restart -e app1
 nb logs -e app1
 nb upgrade -e app1
 nb db start -e app1
@@ -170,6 +173,7 @@ Docker env 会通过已保存的 Docker 容器和镜像进行管理：
 ```bash
 nb init --env app1 --yes --source docker --version alpha
 nb start --env app1
+nb restart --env app1
 nb logs --env app1
 nb stop --env app1
 ```
@@ -198,7 +202,7 @@ nb dev --env app1
 如果要连接已有应用，可以运行 `nb init` 并选择已有应用流程，也可以直接添加 env：
 
 ```bash
-nb env add app1 --base-url http://localhost:13000/api
+nb env add app1 --api-base-url http://localhost:13000/api
 ```
 
 `nb env add` 会在需要时自动进入认证流程。

package/bin/run.js

@@ -38,18 +38,20 @@ function reexecWithTsx() {
     process.exit(1);
   }
 
-  const result = spawnSync(
-    process.execPath,
-    ['--import', pathToFileURL(tsxEntry).href, '--disable-warning=ExperimentalWarning', ...process.argv.slice(1)],
-    {
-      stdio: 'inherit',
-      env: {
-        ...process.env,
-        _NOCO_CLI_TSX_CHILD: '1',
-        NODE_ENV: 'development',
-      },
+  const reexecArgs = ['--import', pathToFileURL(tsxEntry).href];
+  const supportedFlags = Array.from(process.allowedNodeEnvironmentFlags);
+  if (supportedFlags.some((flag) => flag === '--disable-warning' || flag.startsWith('--disable-warning='))) {
+    reexecArgs.push('--disable-warning=ExperimentalWarning');
+  }
+
+  const result = spawnSync(process.execPath, [...reexecArgs, ...process.argv.slice(1)], {
+    stdio: 'inherit',
+    env: {
+      ...process.env,
+      _NOCO_CLI_TSX_CHILD: '1',
+      NODE_ENV: 'development',
     },
-  );
+  });
   process.exit(result.status === null ? 1 : result.status);
 }
 
@@ -59,6 +61,10 @@ if (isDev && !process.env._NOCO_CLI_TSX_CHILD) {
 
 const bootstrapPath = isDev ? path.join(root, 'src/lib/bootstrap.ts') : path.join(root, 'dist/lib/bootstrap.js');
 const { ensureRuntimeFromArgv } = await import(pathToFileURL(bootstrapPath).href);
+const startupUpdatePath = isDev
+  ? path.join(root, 'src/lib/startup-update.ts')
+  : path.join(root, 'dist/lib/startup-update.js');
+const { maybeRunStartupUpdatePrompt } = await import(pathToFileURL(startupUpdatePath).href);
 const { flush, run, settings } = await import('@oclif/core');
 
 if (isDev) {
@@ -100,6 +106,17 @@ function formatCliEntryError(error, argv) {
 
 try {
   const argv = process.argv.slice(2);
+  const startupUpdate = await maybeRunStartupUpdatePrompt(argv);
+  if (startupUpdate.kind === 'updated') {
+    const result = spawnSync(process.execPath, process.argv.slice(1), {
+      stdio: 'inherit',
+      env: {
+        ...process.env,
+        NB_SKIP_STARTUP_UPDATE: '1',
+      },
+    });
+    process.exit(result.status === null ? 1 : result.status);
+  }
   if (argv[0] === 'api') {
     await ensureRuntimeFromArgv(argv, {
       configFile: path.join(root, 'nocobase-ctl.config.json'),

package/dist/commands/db/shared.js

@@ -20,9 +20,9 @@ export async function resolveDbRuntime(envName) {
     if (!runtime) {
         return undefined;
     }
-    const source = runtime.kind === 'remote' ? 'remote' : runtime.source;
+    const source = runtime.kind === 'http' || runtime.kind === 'ssh' ? runtime.kind : runtime.source;
     const dbDialect = String(runtime.env.config.dbDialect ?? 'postgres').trim() || 'postgres';
-    if (runtime.kind !== 'remote' && runtime.env.config.builtinDb) {
+    if ((runtime.kind === 'local' || runtime.kind === 'docker') && runtime.env.config.builtinDb) {
         const containerName = buildDockerDbContainerName(runtime.envName, dbDialect, runtime.workspaceName);
         return {
             kind: 'builtin',
@@ -40,7 +40,7 @@ export async function resolveDbRuntime(envName) {
         source,
         dbDialect,
         address: formatAddress(runtime.env.config.dbHost, runtime.env.config.dbPort),
-        status: runtime.kind === 'remote' ? 'remote' : 'external',
+        status: runtime.kind === 'http' || runtime.kind === 'ssh' ? runtime.kind : 'external',
         appRuntime: runtime,
     };
 }
@@ -52,13 +52,20 @@ export async function builtinDbStatus(containerName) {
 }
 export function formatUnmanagedDbMessage(action, runtime) {
     const verb = action === 'start' ? 'start' : 'stop';
-    if (runtime.appRuntime.kind === 'remote') {
+    if (runtime.appRuntime.kind === 'http') {
         return [
             `Can't ${verb} the database for "${runtime.envName}" from this machine.`,
             'This env only has an API connection, so there is no CLI-managed database container here.',
             'If you need CLI-managed database start and stop, create a local env with the built-in database option enabled.',
         ].join('\n');
     }
+    if (runtime.appRuntime.kind === 'ssh') {
+        return [
+            `Can't ${verb} the database for "${runtime.envName}" yet.`,
+            'SSH env support is reserved but not implemented yet.',
+            'Use a local env with the built-in database option enabled if you need CLI-managed database operations right now.',
+        ].join('\n');
+    }
     return [
         `Can't ${verb} the database for "${runtime.envName}" from this machine.`,
         'This env does not use a CLI-managed built-in database, so there is no saved database container to manage here.',
@@ -66,13 +73,20 @@ export function formatUnmanagedDbMessage(action, runtime) {
     ].join('\n');
 }
 export function formatUnmanagedDbLogsMessage(runtime) {
-    if (runtime.appRuntime.kind === 'remote') {
+    if (runtime.appRuntime.kind === 'http') {
         return [
             `Can't show database logs for "${runtime.envName}" from this machine.`,
             'This env only has an API connection, so there is no CLI-managed database container here.',
             'If you need CLI-managed database logs, create a local env with the built-in database option enabled.',
         ].join('\n');
     }
+    if (runtime.appRuntime.kind === 'ssh') {
+        return [
+            `Can't show database logs for "${runtime.envName}" yet.`,
+            'SSH env support is reserved but not implemented yet.',
+            'Use a local env with the built-in database option enabled if you need CLI-managed database logs right now.',
+        ].join('\n');
+    }
     return [
         `Can't show database logs for "${runtime.envName}" from this machine.`,
         'This env does not use a CLI-managed built-in database, so there is no saved database container to read logs from here.',

package/dist/commands/dev.js

@@ -17,6 +17,13 @@ function formatUnsupportedRuntimeMessage(kind, envName) {
             `Use \`nb logs --env ${envName}\` to inspect the Docker app, or create a source-based env with \`nb init --env ${envName} --source git\`.`,
         ].join('\n');
     }
+    if (kind === 'ssh') {
+        return [
+            `Can't run dev mode for "${envName}" yet.`,
+            'SSH env support is reserved but not implemented yet.',
+            `Create a source-based env with \`nb init --env ${envName} --source git\` if you want local development mode right now.`,
+        ].join('\n');
+    }
     return [
         `Can't run dev mode for "${envName}".`,
         'This env only has an API connection, but `nb dev` requires a local npm or Git source directory.',
@@ -99,7 +106,7 @@ export default class Dev extends Command {
         if (!runtime) {
             this.error(formatMissingManagedAppEnvMessage(requestedEnv));
         }
-        if (runtime.kind === 'docker' || runtime.kind === 'remote') {
+        if (runtime.kind === 'docker' || runtime.kind === 'http' || runtime.kind === 'ssh') {
             this.error(formatUnsupportedRuntimeMessage(runtime.kind, runtime.envName));
         }
         const devPort = flags.port

package/dist/commands/down.js

@@ -12,14 +12,11 @@ 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 { resolveConfiguredEnvPath } from '../lib/cli-home.js';
 import { commandSucceeds, run } from '../lib/run-npm.js';
 import { confirmAction, failTask, isInteractiveTerminal, printInfo, startTask, succeedTask, } from '../lib/ui.js';
 function resolveConfiguredPath(value) {
-    const text = String(value ?? '').trim();
-    if (!text) {
-        return undefined;
-    }
-    return path.isAbsolute(text) ? text : path.resolve(process.cwd(), text);
+    return resolveConfiguredEnvPath(value);
 }
 function assertSafeRemovalPath(target, label) {
     const resolved = path.resolve(target);
@@ -113,13 +110,20 @@ export default class Down extends Command {
         if (!runtime) {
             this.error(formatMissingManagedAppEnvMessage(requestedEnv));
         }
-        if (runtime.kind === 'remote') {
+        if (runtime.kind === 'http') {
             this.error([
                 `Can't bring down "${runtime.envName}" from this machine.`,
                 'This env only has an API connection, so there is no saved local app, Docker app, or managed database to remove here.',
                 'Use `nb env remove` if you only want to remove the CLI connection config.',
             ].join('\n'));
         }
+        if (runtime.kind === 'ssh') {
+            this.error([
+                `Can't bring down "${runtime.envName}" yet.`,
+                'SSH env support is reserved but not implemented yet.',
+                'Use `nb env remove` if you only want to remove the saved CLI config for now.',
+            ].join('\n'));
+        }
         if (flags['remove-data']) {
             let confirmed = false;
             try {

package/dist/commands/env/add.js

@@ -8,6 +8,7 @@
  */
 import { Args, Command, Flags } from '@oclif/core';
 import { upsertEnv } from '../../lib/auth-store.js';
+import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { runPromptCatalog, } from '../../lib/prompt-catalog.js';
 import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, localeText, } from '../../lib/cli-locale.js';
 import { validateApiBaseUrl } from '../../lib/prompt-validators.js';
@@ -45,7 +46,7 @@ export default class EnvAdd extends Command {
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> local',
-        '<%= config.bin %> <%= command.id %> local --scope project --api-base-url http://localhost:13000/api --auth-type oauth',
+        '<%= config.bin %> <%= command.id %> local --api-base-url http://localhost:13000/api --auth-type oauth',
     ];
     static args = {
         name: Args.string({
@@ -73,12 +74,6 @@ export default class EnvAdd extends Command {
             description: 'Skip command intro when invoked by another CLI command',
             default: false,
         }),
-        scope: Flags.string({
-            char: 's',
-            description: 'Where to store env config: project (.nocobase in the repo) or global (user-level); prompted in a TTY when omitted',
-            options: ['project', 'global'],
-            default: 'project',
-        }),
         'default-api-base-url': Flags.string({
             char: 'd',
             hidden: true,
@@ -86,7 +81,6 @@ export default class EnvAdd extends Command {
         }),
         'api-base-url': Flags.string({
             char: 'u',
-            aliases: ['base-url'],
             description: 'Root URL for HTTP API calls, including the /api prefix (e.g. http://localhost:13000/api); prompted in a TTY when omitted',
         }),
         'auth-type': Flags.string({
@@ -199,24 +193,6 @@ export default class EnvAdd extends Command {
             placeholder: envAddText('prompts.name.placeholder'),
             required: true,
         },
-        scope: {
-            type: 'select',
-            message: envAddText('prompts.scope.message'),
-            options: [
-                {
-                    value: 'project',
-                    label: envAddText('prompts.scope.projectLabel'),
-                    hint: envAddText('prompts.scope.projectHint'),
-                },
-                {
-                    value: 'global',
-                    label: envAddText('prompts.scope.globalLabel'),
-                    hint: envAddText('prompts.scope.globalHint'),
-                },
-            ],
-            initialValue: 'project',
-            required: true,
-        },
         apiBaseUrl: {
             type: 'text',
             message: envAddText('prompts.apiBaseUrl.message'),
@@ -252,10 +228,7 @@ export default class EnvAdd extends Command {
         if (name) {
             values.name = name;
         }
-        if (flags.scope) {
-            values.scope = flags.scope;
-        }
-        const apiFromFlag = flags['api-base-url'] ?? flags['base-url'];
+        const apiFromFlag = flags['api-base-url'];
         if (typeof apiFromFlag === 'string' && apiFromFlag.trim() !== '') {
             values.apiBaseUrl = apiFromFlag.trim();
         }
@@ -277,8 +250,16 @@ export default class EnvAdd extends Command {
         return initialValues;
     }
     buildEnvConfig(results, flags) {
+        const source = String(flags.source ?? '').trim();
+        const appRootPath = String(flags['app-root-path'] ?? '').trim();
+        const kind = source === 'docker'
+            ? 'docker'
+            : source === 'npm' || source === 'git' || source === 'local' || appRootPath
+                ? 'local'
+                : 'http';
         const envConfig = {
-            baseUrl: String(results.apiBaseUrl ?? ''),
+            kind,
+            apiBaseUrl: String(results.apiBaseUrl ?? ''),
         };
         for (const [flagName, configKey] of Object.entries(ENV_RUNTIME_FLAG_MAP)) {
             const value = flags[flagName];
@@ -314,10 +295,9 @@ export default class EnvAdd extends Command {
             command: this,
         });
         const envName = String(results.name);
-        const scope = results.scope;
         const envConfig = this.buildEnvConfig(results, parsedFlags);
-        printVerbose(`Saving env "${envName}" with scope "${scope}".`);
-        await upsertEnv(envName, envConfig, { scope });
+        printVerbose(`Saving env "${envName}" globally.`);
+        await upsertEnv(envName, envConfig, { scope: resolveDefaultConfigScope() });
         if (results.authType === 'oauth') {
             await this.config.runCommand('env:auth', [envName]);
         }

package/dist/commands/env/auth.js

@@ -8,7 +8,7 @@
  */
 import { Args, Command, Flags } from '@oclif/core';
 import { getCurrentEnvName } from '../../lib/auth-store.js';
-import { formatCliHomeScope } from '../../lib/cli-home.js';
+import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { authenticateEnvWithOauth } from '../../lib/env-auth.js';
 import { failTask, startTask, succeedTask } from '../../lib/ui.js';
 export default class EnvAuth extends Command {
@@ -16,7 +16,6 @@ export default class EnvAuth extends Command {
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> prod',
-        '<%= config.bin %> <%= command.id %> --scope global',
     ];
     static args = {
         name: Args.string({
@@ -31,31 +30,25 @@ export default class EnvAuth extends Command {
             deprecated: true,
             description: 'Environment name (same as the optional positional argument; for compatibility with -e/--env on other commands)',
         }),
-        scope: Flags.string({
-            char: 's',
-            description: 'Config scope',
-            options: ['project', 'global'],
-        }),
     };
     async run() {
         const { args, flags } = await this.parse(EnvAuth);
-        const scope = flags.scope;
         const nameArg = args.name?.trim();
         const nameFlag = flags.env?.trim() || undefined;
         if (nameArg && nameFlag && nameArg !== nameFlag) {
             this.error(`Environment name was provided both as the argument ("${nameArg}") and as --env ("${nameFlag}"). Please use only one.`);
         }
-        const envName = nameArg || nameFlag || (await getCurrentEnvName({ scope }));
-        startTask(`Starting browser sign-in for "${envName}"${scope ? ` (${formatCliHomeScope(scope)} scope)` : ''}...`);
+        const envName = nameArg || nameFlag || (await getCurrentEnvName({ scope: resolveDefaultConfigScope() }));
+        startTask(`Starting browser sign-in for "${envName}"...`);
         try {
             await authenticateEnvWithOauth({
                 envName,
-                scope,
+                scope: resolveDefaultConfigScope(),
             });
-            succeedTask(`Signed in to "${envName}"${scope ? ` in ${formatCliHomeScope(scope)} scope` : ''}.`);
+            succeedTask(`Signed in to "${envName}".`);
         }
         catch (error) {
-            failTask(`Sign-in failed for "${envName}"${scope ? ` in ${formatCliHomeScope(scope)} scope` : ''}.`);
+            failTask(`Sign-in failed for "${envName}".`);
             throw error;
         }
     }

package/dist/commands/env/list.js

@@ -6,35 +6,30 @@
  * 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 { Command } from '@oclif/core';
 import { listEnvs } from '../../lib/auth-store.js';
-import { formatCliHomeScope } from '../../lib/cli-home.js';
+import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { renderTable } from '../../lib/ui.js';
+function resolveApiBaseUrl(config) {
+    return String(config.apiBaseUrl ?? config.baseUrl ?? config.apibaseUrl ?? '').trim();
+}
 export default class EnvList extends Command {
     static summary = 'List configured environments';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
     ];
-    static flags = {
-        scope: Flags.string({
-            char: 's',
-            description: 'Config scope',
-            options: ['project', 'global'],
-        }),
-    };
     async run() {
-        const { flags } = await this.parse(EnvList);
-        const scope = flags.scope;
-        const { currentEnv, envs } = await listEnvs({ scope });
+        await this.parse(EnvList);
+        const { currentEnv, envs } = await listEnvs({ scope: resolveDefaultConfigScope() });
         const names = Object.keys(envs).sort();
         if (!names.length) {
-            this.log(`No envs configured${scope ? ` in ${formatCliHomeScope(scope)} scope` : ''}.`);
-            this.log('Run `nb env add <name> --base-url <url>` to add one.');
+            this.log('No envs configured.');
+            this.log('Run `nb env add <name> --api-base-url <url>` to add one.');
             return;
         }
         const rows = names.map((name) => {
             const env = envs[name];
-            return [name === currentEnv ? '*' : '', name, env.baseUrl ?? '', env.auth?.type ?? '', env.runtime?.version ?? ''];
+            return [name === currentEnv ? '*' : '', name, resolveApiBaseUrl(env), env.auth?.type ?? '', env.runtime?.version ?? ''];
         });
         this.log(renderTable(['Current', 'Name', 'Base URL', 'Auth', 'Runtime'], rows));
     }

package/dist/commands/env/remove.js

@@ -8,7 +8,7 @@
  */
 import { Args, Command, Flags } from '@oclif/core';
 import { getCurrentEnvName, removeEnv } from '../../lib/auth-store.js';
-import { formatCliHomeScope } from '../../lib/cli-home.js';
+import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { confirmAction, isInteractiveTerminal, printVerbose, setVerboseMode } from '../../lib/ui.js';
 export default class EnvRemove extends Command {
     static summary = 'Remove a configured environment';
@@ -26,11 +26,6 @@ export default class EnvRemove extends Command {
             description: 'Show detailed progress output',
             default: false,
         }),
-        scope: Flags.string({
-            char: 's',
-            description: 'Config scope',
-            options: ['project', 'global'],
-        }),
     };
     static args = {
         name: Args.string({
@@ -41,8 +36,7 @@ export default class EnvRemove extends Command {
     async run() {
         const { args, flags } = await this.parse(EnvRemove);
         setVerboseMode(flags.verbose);
-        const scope = flags.scope;
-        const currentEnv = await getCurrentEnvName({ scope });
+        const currentEnv = await getCurrentEnvName({ scope: resolveDefaultConfigScope() });
         if (args.name === currentEnv && !flags.force) {
             if (!isInteractiveTerminal()) {
                 this.error('Refusing to remove the current env without confirmation. Re-run with `--force`.');
@@ -54,8 +48,8 @@ export default class EnvRemove extends Command {
             }
         }
         printVerbose(`Removing env "${args.name}"`);
-        const result = await removeEnv(args.name, { scope });
-        this.log(`Removed env "${result.removed}"${scope ? ` from ${formatCliHomeScope(scope)} scope` : ''}.`);
+        const result = await removeEnv(args.name, { scope: resolveDefaultConfigScope() });
+        this.log(`Removed env "${result.removed}".`);
         if (result.hasEnvs) {
             this.log(`Current env: ${result.currentEnv}`);
             return;

package/dist/commands/env/update.js

@@ -11,7 +11,7 @@ import { fileURLToPath } from 'node:url';
 import { Args, Command, Flags } from '@oclif/core';
 import { getCurrentEnvName } from '../../lib/auth-store.js';
 import { updateEnvRuntime } from '../../lib/bootstrap.js';
-import { formatCliHomeScope } from '../../lib/cli-home.js';
+import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { failTask, startTask, succeedTask } from '../../lib/ui.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 export default class EnvUpdate extends Command {
@@ -31,12 +31,7 @@ export default class EnvUpdate extends Command {
             description: 'Show detailed progress output',
             default: false,
         }),
-        scope: Flags.string({
-            char: 's',
-            description: 'Config scope',
-            options: ['project', 'global'],
-        }),
-        'base-url': Flags.string({
+        'api-base-url': Flags.string({
             description: 'NocoBase API base URL override. When provided, persist it to the target env before saving the refreshed runtime.',
         }),
         role: Flags.string({
@@ -49,21 +44,20 @@ export default class EnvUpdate extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(EnvUpdate);
-        const scope = flags.scope;
         const envName = args.name;
-        const envLabel = envName ?? (await getCurrentEnvName({ scope }));
-        startTask(`Updating env runtime: ${envLabel}${scope ? ` (${formatCliHomeScope(scope)})` : ''}`);
+        const envLabel = envName ?? (await getCurrentEnvName({ scope: resolveDefaultConfigScope() }));
+        startTask(`Updating env runtime: ${envLabel}`);
         try {
             const runtime = await updateEnvRuntime({
                 envName,
-                scope,
-                baseUrl: flags['base-url'],
+                scope: resolveDefaultConfigScope(),
+                baseUrl: flags['api-base-url'],
                 role: flags.role,
                 token: flags.token,
                 configFile: path.join(path.dirname(path.dirname(path.dirname(__dirname))), 'nocobase-ctl.config.json'),
                 verbose: flags.verbose,
             });
-            succeedTask(`Updated env "${envLabel}" to runtime "${runtime.version}"${scope ? ` in ${formatCliHomeScope(scope)} scope` : ''}.`);
+            succeedTask(`Updated env "${envLabel}" to runtime "${runtime.version}".`);
         }
         catch (error) {
             failTask(`Failed to update env "${envLabel}".`);

package/dist/commands/env/use.js

@@ -6,21 +6,14 @@
  * 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 { Args, Command } from '@oclif/core';
 import { setCurrentEnv } from '../../lib/auth-store.js';
-import { formatCliHomeScope } from '../../lib/cli-home.js';
+import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 export default class EnvUse extends Command {
     static summary = 'Switch the current environment';
     static examples = [
         '<%= config.bin %> <%= command.id %> local',
     ];
-    static flags = {
-        scope: Flags.string({
-            char: 's',
-            description: 'Config scope',
-            options: ['project', 'global'],
-        }),
-    };
     static args = {
         name: Args.string({
             description: 'Configured environment name',
@@ -28,9 +21,8 @@ export default class EnvUse extends Command {
         }),
     };
     async run() {
-        const { args, flags } = await this.parse(EnvUse);
-        const scope = flags.scope;
-        await setCurrentEnv(args.name, { scope });
-        this.log(`Current env: ${args.name}${scope ? ` (${formatCliHomeScope(scope)} scope)` : ''}`);
+        const { args } = await this.parse(EnvUse);
+        await setCurrentEnv(args.name, { scope: resolveDefaultConfigScope() });
+        this.log(`Current env: ${args.name}`);
     }
 }