@nocobase/cli 2.1.0-alpha.32 → 2.1.0-alpha.34

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

@@ -160,7 +160,7 @@ export default class AppDown extends Command {
         }),
         yes: Flags.boolean({
             char: 'y',
-            description: 'Skip the interactive cross-env confirmation prompt',
+            description: 'Confirm using --env when it targets a different env than the current env',
             default: false,
         }),
         force: Flags.boolean({

package/dist/commands/app/upgrade.js

@@ -12,9 +12,9 @@ import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runLocalNo
 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;
@@ -361,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',

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

@@ -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,
         }),
     };

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/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/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,
         }),
     };

package/dist/commands/env/status.js

@@ -22,7 +22,7 @@ export default class EnvStatus extends Command {
     ];
     static args = {
         name: Args.string({
-            description: 'Configured environment name. Defaults to the current env when omitted',
+            description: 'Configured environment name to inspect. Defaults to the current env when omitted; cannot be used with --all',
             required: false,
         }),
     };

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

@@ -18,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,
         }),
     };

package/dist/commands/install.js

@@ -19,6 +19,7 @@ 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';
@@ -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,

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 { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
-import { ensureInstanceId, licenseEnvFlag, licenseJsonFlag, licensePkgUrlFlag, redactLicenseKey, requireLicenseRuntime, resolveLicenseKeyFile, resolveLicenseServiceUrl, saveLicenseKey, sanitizeLicenseOutput, validateLicenseKey, } from './shared.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) {
@@ -171,7 +171,7 @@ export default class LicenseActivate extends Command {
         '<%= 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',
@@ -193,10 +193,7 @@ export default class LicenseActivate extends Command {
             description: 'Application name for online activation',
         }),
         'pkg-url': licensePkgUrlFlag,
-        yes: Flags.boolean({
-            description: 'Skip the interactive cross-env confirmation prompt',
-            default: false,
-        }),
+        yes: licenseYesFlag,
     };
     async run() {
         const { flags } = await this.parse(LicenseActivate);

package/dist/commands/license/id.js

@@ -8,7 +8,7 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
-import { generateAndSaveInstanceId, licenseEnvFlag, licenseJsonFlag, readSavedInstanceId, requireLicenseRuntime, resolveInstanceIdFile, } from './shared.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';
@@ -20,12 +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: Flags.boolean({
-            description: 'Skip the interactive cross-env confirmation prompt',
-            default: false,
-        }),
+        yes: licenseYesFlag,
         force: Flags.boolean({
             description: 'Force regenerate the instance ID even if one is already saved',
             default: false,

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

@@ -9,7 +9,7 @@
 import { Command, Flags } from '@oclif/core';
 import pc from 'picocolors';
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../../lib/env-guard.js';
-import { licenseEnvFlag, licenseJsonFlag, licensePkgUrlFlag, requireLicenseRuntime } from '../shared.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';
@@ -32,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({
@@ -43,10 +43,7 @@ export default class LicensePluginsClean extends Command {
             description: 'Show detailed per-plugin clean logs',
             default: false,
         }),
-        yes: Flags.boolean({
-            description: 'Skip the interactive cross-env confirmation prompt',
-            default: false,
-        }),
+        yes: licenseYesFlag,
     };
     async run() {
         const { flags } = await this.parse(LicensePluginsClean);

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

@@ -6,9 +6,9 @@
  * 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 { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../../lib/env-guard.js';
-import { licenseEnvFlag, licenseJsonFlag, licensePkgUrlFlag, requireLicenseRuntime } from '../shared.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 {
@@ -20,13 +20,10 @@ 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: Flags.boolean({
-            description: 'Skip the interactive cross-env confirmation prompt',
-            default: false,
-        }),
+        yes: licenseYesFlag,
     };
     async run() {
         const { flags } = await this.parse(LicensePluginsList);

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

@@ -10,8 +10,9 @@ import { Command, Flags } from '@oclif/core';
 import pc from 'picocolors';
 import { readFile } from 'node:fs/promises';
 import path from 'node:path';
+import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_VERSION, resolveDockerImageRef, } from "../../../lib/docker-image.js";
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../../lib/env-guard.js';
-import { licenseEnvFlag, licenseJsonFlag, licensePkgUrlFlag, requireLicenseRuntime } from '../shared.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';
@@ -19,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':
@@ -90,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',
@@ -138,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({
@@ -152,10 +154,7 @@ export default class LicensePluginsSync extends Command {
             description: 'Show detailed per-plugin sync logs',
             default: false,
         }),
-        yes: Flags.boolean({
-            description: 'Skip the interactive cross-env confirmation prompt',
-            default: false,
-        }),
+        yes: licenseYesFlag,
     };
     async run() {
         const { flags } = await this.parse(LicensePluginsSync);

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

@@ -8,7 +8,7 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
-import { ensureInstanceId, licenseEnvFlag, licenseJsonFlag, requireLicenseRuntime } from './shared.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.';
@@ -19,12 +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: Flags.boolean({
-            description: 'Skip the interactive cross-env confirmation prompt',
-            default: false,
-        }),
+        yes: licenseYesFlag,
         doctor: Flags.boolean({
             description: 'Run extra diagnostic checks and suggestions',
             default: false,

package/dist/commands/plugin/disable.js

@@ -28,7 +28,7 @@ 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',

package/dist/commands/plugin/enable.js

@@ -28,7 +28,7 @@ export default class PluginEnable 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 enable plugins for. Defaults to the current env when omitted',
         }),
         yes: Flags.boolean({
             char: 'y',

package/dist/commands/plugin/list.js

@@ -22,7 +22,7 @@ export default class PluginList 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 inspect plugins for. Defaults to the current env when omitted',
         }),
         yes: Flags.boolean({
             char: 'y',

package/dist/commands/source/dev.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 { announceTargetEnv, printInfo } from '../../lib/ui.js';
 function formatUnsupportedRuntimeMessage(kind, envName) {
@@ -72,7 +73,13 @@ export default class SourceDev extends Command {
     static flags = {
         env: Flags.string({
             char: 'e',
-            description: 'CLI env name for dev mode. Defaults to the current env when omitted',
+            description: 'CLI env name to run dev mode for. Defaults to the current env when omitted',
+            required: false,
+        }),
+        yes: Flags.boolean({
+            char: 'y',
+            description: 'Confirm using --env when it targets a different env than the current env',
+            default: false,
             required: false,
         }),
         'db-sync': Flags.boolean({
@@ -103,6 +110,17 @@ export default class SourceDev extends Command {
     async run() {
         const { flags } = await this.parse(SourceDev);
         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/source/download.js

@@ -13,10 +13,9 @@ import path from 'node:path';
 import { stdin as stdinStream, stdout as stdoutStream } from 'node:process';
 import { runPromptCatalog, } from "../../lib/prompt-catalog.js";
 import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, localeText, resolveCliLocale, translateCli, } from "../../lib/cli-locale.js";
+import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_REGISTRY_ZH_CN, resolveDockerImageRef, } from "../../lib/docker-image.js";
 import { run } from "../../lib/run-npm.js";
 import { printVerbose, setVerboseMode, startTask, stopTask, updateTask } from '../../lib/ui.js';
-const DEFAULT_DOCKER_REGISTRY = 'nocobase/nocobase';
-const DEFAULT_DOCKER_REGISTRY_ZH_CN = 'registry.cn-shanghai.aliyuncs.com/nocobase/nocobase';
 const DEFAULT_DOCKER_PLATFORM = 'auto';
 const DEFAULT_DOWNLOAD_VERSION = 'beta';
 const downloadText = (key, values) => localeText(`commands.download.${key}`, values);
@@ -422,9 +421,11 @@ export default class SourceDownload extends Command {
         return outputAbs;
     }
     dockerTarPath(flags, outputAbs) {
-        const image = String(flags['docker-registry'] ?? '').trim() || defaultDockerRegistryForLang(process.env.NB_LOCALE);
-        const tag = flags.version ?? 'latest';
-        const safeBase = `${image.replace(/[/:]/g, '-')}-${tag.replace(/[/\\]/g, '-')}`;
+        const imageRef = resolveDockerImageRef(flags['docker-registry'], flags.version, {
+            defaultRegistry: defaultDockerRegistryForLang(process.env.NB_LOCALE),
+            defaultVersion: 'latest',
+        });
+        const safeBase = imageRef.replace(/[\\/:]/g, '-');
         return path.join(outputAbs, `${safeBase}.tar`);
     }
     /**
@@ -709,9 +710,10 @@ export default class SourceDownload extends Command {
         return argv;
     }
     async downloadFromDocker(flags) {
-        const image = String(flags['docker-registry'] ?? '').trim() || defaultDockerRegistryForLang(process.env.NB_LOCALE);
-        const tag = flags.version ?? 'latest';
-        const imageRef = `${image}:${tag}`;
+        const imageRef = resolveDockerImageRef(flags['docker-registry'], flags.version, {
+            defaultRegistry: defaultDockerRegistryForLang(process.env.NB_LOCALE),
+            defaultVersion: 'latest',
+        });
         const platform = dockerPlatformArg(flags['docker-platform']);
         const pullArgs = ['pull'];
         if (platform) {

package/dist/lib/app-managed-resources.js

@@ -10,10 +10,9 @@ import { mkdir, readdir } from 'node:fs/promises';
 import { dockerContainerExists, startDockerContainer } from './app-runtime.js';
 import { deriveBuiltinDbConnection, resolveBuiltinDbConnection } from './builtin-db.js';
 import { resolveConfiguredEnvPath } from './cli-home.js';
+import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_VERSION, resolveDockerImageRef, } from "./docker-image.js";
 import { commandSucceeds, run } from './run-npm.js';
 import Install from '../commands/install.js';
-const DEFAULT_DOCKER_REGISTRY = 'nocobase/nocobase';
-const DEFAULT_DOCKER_VERSION = 'alpha';
 const DOCKER_APP_STORAGE_DESTINATION = '/app/nocobase/storage';
 function commandStdio(verbose) {
     return verbose ? 'inherit' : 'ignore';
@@ -102,7 +101,10 @@ export function buildSavedDockerRunArgs(runtime) {
     const dbPassword = trimValue(config.dbPassword);
     const dockerRegistry = trimValue(config.dockerRegistry) || DEFAULT_DOCKER_REGISTRY;
     const version = trimValue(config.downloadVersion) || DEFAULT_DOCKER_VERSION;
-    const imageRef = `${dockerRegistry}:${version}`;
+    const imageRef = resolveDockerImageRef(dockerRegistry, version, {
+        defaultRegistry: DEFAULT_DOCKER_REGISTRY,
+        defaultVersion: DEFAULT_DOCKER_VERSION,
+    });
     const missing = [];
     if (!storagePath) {
         missing.push('storagePath');

package/dist/lib/docker-image.js

@@ -0,0 +1,37 @@
+/**
+ * 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.
+ */
+export const DEFAULT_DOCKER_REGISTRY = 'nocobase/nocobase';
+export const DEFAULT_DOCKER_REGISTRY_ZH_CN = 'registry.cn-shanghai.aliyuncs.com/nocobase/nocobase';
+export const DEFAULT_DOCKER_VERSION = 'alpha';
+export const DOCKER_IMAGE_FULL_SUFFIX = '-full';
+const OFFICIAL_FULL_IMAGE_REGISTRIES = new Set([
+    DEFAULT_DOCKER_REGISTRY,
+    DEFAULT_DOCKER_REGISTRY_ZH_CN,
+]);
+function trimValue(value) {
+    return String(value ?? '').trim();
+}
+export function shouldUseFullDockerImageTag(registry) {
+    return OFFICIAL_FULL_IMAGE_REGISTRIES.has(trimValue(registry));
+}
+export function normalizeDockerImageTag(registry, version) {
+    const tag = trimValue(version) || DEFAULT_DOCKER_VERSION;
+    if (!shouldUseFullDockerImageTag(registry)) {
+        return tag;
+    }
+    return tag.endsWith(DOCKER_IMAGE_FULL_SUFFIX)
+        ? tag
+        : `${tag}${DOCKER_IMAGE_FULL_SUFFIX}`;
+}
+export function resolveDockerImageRef(registry, version, options) {
+    const resolvedRegistry = trimValue(registry) || options?.defaultRegistry || DEFAULT_DOCKER_REGISTRY;
+    const rawVersion = trimValue(version) || options?.defaultVersion || DEFAULT_DOCKER_VERSION;
+    const normalizedTag = normalizeDockerImageTag(resolvedRegistry, rawVersion);
+    return `${resolvedRegistry}:${normalizedTag}`;
+}

package/dist/lib/plugin-storage.js

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import path from 'node:path';
-import { access, lstat, mkdir, readdir, readlink, realpath, rm, stat, symlink } from 'node:fs/promises';
+import { access, lstat, readlink, rm } from 'node:fs/promises';
 async function pathExists(target) {
     try {
         await access(target);
@@ -28,69 +28,6 @@ export function resolvePluginStoragePath(storagePath) {
     }
     return path.resolve(process.cwd(), 'storage', 'plugins');
 }
-async function getStoragePluginNames(target) {
-    const plugins = [];
-    const items = await readdir(target);
-    for (const item of items) {
-        const itemPath = path.resolve(target, item);
-        if (item.startsWith('@')) {
-            const statResult = await stat(itemPath);
-            if (!statResult.isDirectory()) {
-                continue;
-            }
-            const children = await getStoragePluginNames(itemPath);
-            plugins.push(...children.map((child) => `${item}/${child}`));
-            continue;
-        }
-        if (await pathExists(path.resolve(itemPath, 'package.json'))) {
-            plugins.push(item);
-        }
-    }
-    return plugins;
-}
-async function ensureOrgDirectory(nodeModulesPath, pluginName) {
-    if (!pluginName.startsWith('@')) {
-        return;
-    }
-    const [orgName] = pluginName.split('/');
-    await mkdir(path.resolve(nodeModulesPath, orgName), { recursive: true });
-}
-async function isSymlinkValid(linkPath, targetPath) {
-    try {
-        if (await pathExists(linkPath)) {
-            const realPath = await realpath(linkPath);
-            return realPath === targetPath;
-        }
-    }
-    catch {
-        return false;
-    }
-    return false;
-}
-async function createStoragePluginSymlink(storagePluginsPath, nodeModulesPath, pluginName) {
-    const targetPath = path.resolve(storagePluginsPath, pluginName);
-    if (!(await pathExists(targetPath))) {
-        return;
-    }
-    await ensureOrgDirectory(nodeModulesPath, pluginName);
-    const linkPath = path.resolve(nodeModulesPath, pluginName);
-    if (await isSymlinkValid(linkPath, targetPath)) {
-        return;
-    }
-    await rm(linkPath, { recursive: true, force: true });
-    await symlink(targetPath, linkPath, 'dir');
-}
-export async function createStoragePluginsSymlink(storagePath, nodeModulesPath = String(process.env.NODE_MODULES_PATH ?? '').trim()) {
-    if (!nodeModulesPath) {
-        return;
-    }
-    const storagePluginsPath = resolvePluginStoragePath(storagePath);
-    if (!(await pathExists(storagePluginsPath))) {
-        return;
-    }
-    const pluginNames = await getStoragePluginNames(storagePluginsPath);
-    await Promise.all(pluginNames.map(async (pluginName) => await createStoragePluginSymlink(storagePluginsPath, nodeModulesPath, pluginName)));
-}
 export async function removeStoragePluginSymlink(pluginName, storagePath, nodeModulesPath = String(process.env.NODE_MODULES_PATH ?? '').trim()) {
     if (!nodeModulesPath) {
         return false;

package/dist/lib/session-integration.js

@@ -409,41 +409,25 @@ function buildManagedFileContent(shell) {
         case 'zsh':
             return [
                 '# NocoBase session integration',
-                'if [ -n "${CODEX_THREAD_ID:-}" ]; then',
-                '  export NB_SESSION_ID="${CODEX_THREAD_ID}"',
-                'else',
-                `  export NB_SESSION_ID="nb-$(node -e 'console.log(require("node:crypto").randomUUID())')"`,
-                'fi',
+                `export NB_SESSION_ID="nb-$(node -e 'console.log(require("node:crypto").randomUUID())')"`,
                 '',
             ].join('\n');
         case 'fish':
             return [
                 '# NocoBase session integration',
-                'if set -q CODEX_THREAD_ID',
-                '    set -gx NB_SESSION_ID "$CODEX_THREAD_ID"',
-                'else',
-                '    set -gx NB_SESSION_ID "nb-"(node -e "console.log(require(\'node:crypto\').randomUUID())")',
-                'end',
+                'set -gx NB_SESSION_ID "nb-"(node -e "console.log(require(\'node:crypto\').randomUUID())")',
                 '',
             ].join('\n');
         case 'powershell':
             return [
                 '# NocoBase session integration',
-                'if ($env:CODEX_THREAD_ID) {',
-                '  $env:NB_SESSION_ID = $env:CODEX_THREAD_ID',
-                '} else {',
                 '  $env:NB_SESSION_ID = "nb-" + [guid]::NewGuid().ToString()',
-                '}',
                 '',
             ].join('\n');
         case 'cmd':
             return [
                 '@echo off',
-                'if defined CODEX_THREAD_ID (',
-                '  set "NB_SESSION_ID=%CODEX_THREAD_ID%"',
-                ') else (',
-                '  set "NB_SESSION_ID=nb-%RANDOM%%RANDOM%%RANDOM%%RANDOM%"',
-                ')',
+                'set "NB_SESSION_ID=nb-%RANDOM%%RANDOM%%RANDOM%%RANDOM%"',
                 '',
             ].join('\r\n');
         default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.0-alpha.32",
+  "version": "2.1.0-alpha.34",
   "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": "1ba7d717e156651db17c615f9b9c48edd669d19b"
+  "gitHead": "59970f73bdbea2656e20cd24357bacf78a3f759f"
 }