@nocobase/cli 2.1.0-beta.42 → 2.1.0-beta.42-test.2

package/dist/lib/startup-update.js

@@ -10,6 +10,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { confirm } from "./inquirer.js";
+import { DEFAULT_UPDATE_POLICY, getExplicitCliConfigValue, loadCliConfig, } from './cli-config.js';
 import { inspectSelfInstall, inspectSelfStatus, } from './self-manager.js';
 import { inspectSkillsStatus } from './skills-manager.js';
 import { resolveCliHomeDir } from './cli-home.js';
@@ -83,39 +84,53 @@ async function writeCurrentInstallEntry(updater) {
     const state = await readState();
     const installBinPath = getCurrentInstallBinPath();
     const nextEntry = updater(getCurrentInstallEntry(state), state);
+    const entries = {
+        ...(state.entries ?? {}),
+    };
+    if (nextEntry?.policy || nextEntry?.lastCheckedDate) {
+        entries[installBinPath] = nextEntry;
+    }
+    else {
+        delete entries[installBinPath];
+    }
     await writeState({
         ...state,
-        entries: {
-            ...(state.entries ?? {}),
-            [installBinPath]: nextEntry,
-        },
+        entries: Object.keys(entries).length ? entries : undefined,
     });
 }
 async function markChecked(now = new Date()) {
-    await writeCurrentInstallEntry((current, state) => {
+    await writeCurrentInstallEntry((current) => {
         return {
-            policy: current?.policy ?? 'daily',
+            ...current,
             lastCheckedDate: todayStamp(now),
         };
     });
 }
-async function disableStartupUpdateForCurrentInstall() {
-    await writeCurrentInstallEntry((current, state) => {
-        return {
-            policy: 'disabled',
-            lastCheckedDate: current?.lastCheckedDate
-                ?? state.lastCheckedDate,
-        };
-    });
+function resolveLegacyStartupUpdatePolicy(state) {
+    const policy = getCurrentInstallEntry(state)?.policy;
+    if (policy === 'disabled') {
+        return 'off';
+    }
+    if (policy === 'daily') {
+        return 'prompt';
+    }
+    return undefined;
 }
-async function enableDailyStartupUpdateForCurrentInstall() {
-    await writeCurrentInstallEntry((current, state) => {
-        return {
-            policy: 'daily',
-            lastCheckedDate: current?.lastCheckedDate
-                ?? state.lastCheckedDate,
-        };
-    });
+async function resolveStartupUpdatePolicy(state) {
+    const config = await loadCliConfig({ scope: 'global' });
+    const explicit = getExplicitCliConfigValue(config, 'update.policy');
+    return explicit ?? resolveLegacyStartupUpdatePolicy(state) ?? DEFAULT_UPDATE_POLICY;
+}
+export async function clearLegacyStartupUpdatePolicyForCurrentInstall() {
+    const state = await readState();
+    const current = getCurrentInstallEntry(state);
+    if (!current?.policy) {
+        return false;
+    }
+    await writeCurrentInstallEntry(() => ({
+        lastCheckedDate: current.lastCheckedDate,
+    }));
+    return true;
 }
 export async function shouldRunStartupUpdateCheck(argv, now = new Date()) {
     if (process.env[NB_SKIP_STARTUP_UPDATE_ENV] === '1') {
@@ -125,19 +140,14 @@ export async function shouldRunStartupUpdateCheck(argv, now = new Date()) {
         return false;
     }
     const state = await readState();
-    const currentEntry = getCurrentInstallEntry(state);
-    if (currentEntry?.policy === 'disabled') {
+    const policy = await resolveStartupUpdatePolicy(state);
+    if (policy === 'off') {
         return false;
     }
-    if (currentEntry?.policy === 'daily') {
-        return readCurrentInstallLastCheckedDate(state) !== todayStamp(now);
-    }
     const selfInstall = await inspectSelfInstall();
     if (!shouldEnableStartupUpdateForInstallMethod(selfInstall.installMethod)) {
-        await disableStartupUpdateForCurrentInstall();
         return false;
     }
-    await enableDailyStartupUpdateForCurrentInstall();
     return readCurrentInstallLastCheckedDate(state) !== todayStamp(now);
 }
 export function shouldEnableStartupUpdateForInstallMethod(installMethod) {
@@ -189,14 +199,13 @@ function buildPromptMessage(selfStatus, skillsStatus) {
     return lines.join('\n');
 }
 function buildUpdateCommands(selfStatus, skillsStatus) {
-    const commands = [];
     if (selfStatus.updateAvailable && selfStatus.updatable) {
-        commands.push('nb self update --yes');
+        return [skillsStatus.updateAvailable === true ? 'nb self update --yes --skills' : 'nb self update --yes'];
     }
     if (skillsStatus.updateAvailable === true) {
-        commands.push('nb skills update --yes');
+        return ['nb skills update --yes'];
     }
-    return commands;
+    return [];
 }
 function buildNonInteractiveWarning(selfStatus, skillsStatus) {
     const commands = buildUpdateCommands(selfStatus, skillsStatus);
@@ -233,26 +242,36 @@ function buildDeclinedWarning(selfStatus, skillsStatus) {
         'You may run into compatibility issues until you update.',
     ].join(' ');
 }
-async function runStartupUpdates() {
-    await run('nb', ['self', 'update', '--yes'], {
-        stdio: 'inherit',
-        env: {
-            [NB_SKIP_STARTUP_UPDATE_ENV]: '1',
-        },
-        errorName: 'nb self update',
-    });
-    await run('nb', ['skills', 'update', '--yes'], {
-        stdio: 'inherit',
-        env: {
-            [NB_SKIP_STARTUP_UPDATE_ENV]: '1',
-        },
-        errorName: 'nb skills update',
-    });
+async function runStartupUpdates(selfStatus, skillsStatus) {
+    if (selfStatus.updateAvailable && selfStatus.updatable) {
+        const args = ['self', 'update', '--yes'];
+        if (skillsStatus.updateAvailable === true) {
+            args.push('--skills');
+        }
+        await run('nb', args, {
+            stdio: 'inherit',
+            env: {
+                [NB_SKIP_STARTUP_UPDATE_ENV]: '1',
+            },
+            errorName: 'nb self update',
+        });
+        return;
+    }
+    if (skillsStatus.updateAvailable === true) {
+        await run('nb', ['skills', 'update', '--yes'], {
+            stdio: 'inherit',
+            env: {
+                [NB_SKIP_STARTUP_UPDATE_ENV]: '1',
+            },
+            errorName: 'nb skills update',
+        });
+    }
 }
-export async function maybeRunStartupUpdatePrompt(argv) {
+export async function maybeRunStartupUpdate(argv) {
     if (!(await shouldRunStartupUpdateCheck(argv))) {
         return { kind: 'skipped' };
     }
+    const policy = await resolveStartupUpdatePolicy(await readState());
     const selfStatus = await inspectSelfStatus();
     const skillsStatus = await inspectSkillsStatus();
     if (!hasPendingUpdates(selfStatus, skillsStatus)) {
@@ -264,6 +283,11 @@ export async function maybeRunStartupUpdatePrompt(argv) {
         await markChecked();
         return { kind: 'warned' };
     }
+    if (policy === 'auto') {
+        await runStartupUpdates(selfStatus, skillsStatus);
+        await markChecked();
+        return { kind: 'updated' };
+    }
     let answer = false;
     try {
         answer = await confirm({
@@ -279,7 +303,7 @@ export async function maybeRunStartupUpdatePrompt(argv) {
         await markChecked();
         return { kind: 'declined' };
     }
-    await runStartupUpdates();
+    await runStartupUpdates(selfStatus, skillsStatus);
     await markChecked();
     return { kind: 'updated' };
 }

package/dist/locale/en-US.json

@@ -370,6 +370,12 @@
           "description": "Set up the first admin."
         }
       }
+    },
+    "env": {
+      "messages": {
+        "noEnvsConfigured": "No envs configured.",
+        "noEnvsConfiguredHelp": "Run `nb init --ui` to create one first."
+      }
     }
   },
   "apiCommandCompat": {

package/dist/locale/zh-CN.json

@@ -370,6 +370,12 @@
           "description": "设置第一个管理员账号。"
         }
       }
+    },
+    "env": {
+      "messages": {
+        "noEnvsConfigured": "尚未配置任何 env。",
+        "noEnvsConfiguredHelp": "请先运行 `nb init --ui` 创建一个。"
+      }
     }
   },
   "apiCommandCompat": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.0-beta.42",
+  "version": "2.1.0-beta.42-test.2",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -139,6 +139,5 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
-  },
-  "gitHead": "619b4d06c934bf3266ba7f388438db018217c87d"
+  }
 }

package/LICENSE.txt

@@ -1,107 +0,0 @@
-Updated Date: February 24, 2026
-
-NocoBase License Agreement
-
-NOCOBASE PTE. LTD.，a Singaporean Exempt Private Company Limited by Shares with its principal place of business located at 112 ROBINSON ROAD, #03-01, SINGAPORE ("The Company") https://www.nocobase.com/ issues this License Agreement ("Agreement") to you. You, as an individual or a company ("The User"), will be deemed to voluntarily accept all terms of this Agreement by using NocoBase (including but not limited to obtaining NocoBase source code or installation package in any form, installing and using NocoBase, purchasing NocoBase commercial license and services, purchasing NocoBase commercial plugins). If the User does not agree to any term of this Agreement, or cannot accurately understand our interpretation of the relevant terms, please stop using it immediately.
-
-This Agreement applies to any use, quotation, contract, invoice, and all software delivered by the Company. The User and the Company or NocoBase's agents can no longer sign a separate license agreement for the sale and delivery of the software.
-
-The Company reserves the right to formulate and modify this Agreement from time to time as needed. If there are changes, the Company will announce them in the form of website announcements, without further individual notification. The changed Agreement will automatically take effect once it is announced, becoming part of this Agreement.
-
-==============
-1. Definitions
-==============
-
-1.1 "Software" refers to the NocoBase kernel and plugins placed in the same code repository as the kernel, including their source code, installation packages, images, and all their modifications, updates, and upgrades.
-
-1.2 "Community Edition" refers to the free version of the Software provided to the User through public channels.
-
-1.3 "Commercial Edition" refers to the paid version of the Software purchased by the User from the Company or its agents, downloaded through exclusive channels, and includes additional benefits. It consists of three versions: Standard Edition, Professional Edition, and Enterprise Edition.
-
-1.4 "Upper Layer Application" refers to a specific business use case application serving internal or external customers of the User, developed based on Software and Commercial Plugins, such as ERP/CRM.
-
-1.5 "Customer" refers to the clients who purchase the User's Upper Layer Application.
-
-1.6 "Third-Party Open Source Software" refers to open source software provided with Software and Commercial Plugins. They are licensed through various published open source software licenses or copyright notices accompanying such software.
-
-===================================
-2. Intellectual Property Protection
-===================================
-
-Except for Third-Party Open Source Software, the Company owns all copyrights, trademark rights, patent rights, trade secrets, and other intellectual property rights of the Software, and has registered and protected them in relevant countries and regions according to the "Paris Convention" or "TRIPS Agreement", ensuring that the intellectual property rights of the Software and Commercial Plugins are internationally recognized and protected.
-
-=============
-3. Disclaimer
-=============
-
-3.1 The User shall not use the Software and Commercial Plugins to engage in activities that contravene applicable laws and regulations or offend against public order or religious prohibitions. All legal liabilities and consequences arising from the User’s use shall be borne by the User.
-
-3.2 The Company shall not be liable for any direct, indirect, special, incidental, or consequential damages (including but not limited to loss of profits, business interruption, data loss, or business information disclosure) caused by the User's use of the Software and Commercial Plugins, even if it has been previously informed of the possibility of such damages.
-
-===============
-4. License Type
-===============
-
-4.1 This Agreement serves as the unified license agreement for NocoBase Software, applying to both the Community Edition and the Commercial Editions.
-
-4.2 This Agreement incorporates and references the full text of the Apache License, Version 2.0 ("Apache-2.0", available at: https://www.apache.org/licenses/LICENSE-2.0 ). Users must comply with the Apache-2.0 License as well as the supplementary terms set forth in this Agreement. In case of any inconsistency between Apache-2.0 and this Agreement, the supplementary terms of this Agreement shall prevail.
-
-================================================
-5. Rights and Obligations of Open Source License
-================================================
-
-5.1 The Software can be used for commercial purposes.
-
-5.2 It is not allowed to remove or change the brand, name, link, version number, license, and other information about NocoBase on the Software interface, except for the main LOGO in the upper left corner of the page.
-
-5.3 It is not allowed to remove or change all intellectual property statements about NocoBase in the code.
-
-5.4 It is not allowed to provide to the public any form of no-code, zero-code, low-code, AI platform SaaS/PaaS products using the original or modified Software.
-
-===============================
-6. Rights of Commercial License
-===============================
-
-6.1 Obtain a permanent commercial license of the Software.
-
-6.2 Get software upgrades and exclusive technical support during the upgrade validity period.
-
-6.3 The licensed Software can be used for commercial purposes with no restrictions on the number of applications and users.
-
-6.4 Can remove or change the brand, name, link, version number, license, and other information about NocoBase on the Software interface.
-
-6.5 The User holding a Professional or Enterprise Edition License can sell Upper Layer Application to its Customers.
-
-6.6 If there are other agreements in the contract for the above rights, the contract agreement shall prevail.
-
-====================================
-7. Obligations of Commercial License
-====================================
-
-7.1 It is not allowed to remove or change all intellectual property statements about NocoBase in the code.
-
-7.2 It is not allowed to sell, transfer, lease, share, gift, or distribute the Commercial License.
-
-7.3 It is not allowed to sell, transfer, lease, share, or distribute any form of no-code, zero-code, low-code, AI platform, or developer tools developed based on Software.
-
-7.4 It is not allowed to provide any form of no-code, zero-code, low-code, AI platform SaaS/PaaS products to the public using the original or modified Software.
-
-7.5 It is not allowed for the User holding a Standard Edition license to sell Upper Layer Application to Customers without a Commercial license.
-
-7.6 It is not allowed for the User holding a Professional or Enterprise Edition license to sell Upper Layer Application to Customers without a Commercial license with access to further development and configuration.
-
-7.7 If there is a violation of the above obligations or the terms of this Agreement, the rights owned by the User will be immediately terminated, the paid fees will not be refunded, and the Company reserves the right to pursue the User's legal responsibility.
-
-7.8 If there are other agreements in the contract for the above obligations, the contract agreement shall prevail.
-
-=============================================================
-8.  Legal Jurisdiction, Interpretation, and Dispute Resolution
-=============================================================
-
-8.1 Except for Mainland China, the interpretation, application, and all matters related to this agreement are subject to the jurisdiction of Singapore law.
-
-8.2 Any dispute related to this Agreement should first be resolved through friendly negotiation. If the negotiation fails to resolve the dispute, the dispute should be submitted to the International Chamber of Commerce (ICC) for arbitration. The arbitration venue should be Singapore, conducted in English.
-
-8.3 All terms and conditions of this Agreement shall be deemed enforceable to the maximum extent permitted by applicable law. If any term of this Agreement is deemed invalid by any applicable law, the invalidity of that term does not affect the validity of any other term of this Agreement, and it should be deemed that the invalid term has been modified as much as possible to make it valid and enforceable, or if the term cannot be modified, it should be deemed to have been deleted from this Agreement.
-
-8.4 The arbitration award is final, binding on both parties, and can be enforced in any court with jurisdiction.