@nocobase/cli 2.1.2 → 2.1.3

package/dist/commands/skills/check.js

@@ -12,10 +12,7 @@ import { printInfo, renderTable } from '../../lib/ui.js';
 export default class SkillsCheck extends Command {
     static summary = 'Check the globally installed NocoBase AI coding skills';
     static description = 'Inspect the global NocoBase AI coding skills and report whether they are managed by the CLI and whether an update is available.';
-    static examples = [
-        '<%= config.bin %> <%= command.id %>',
-        '<%= config.bin %> <%= command.id %> --json',
-    ];
+    static examples = ['<%= config.bin %> <%= command.id %>', '<%= config.bin %> <%= command.id %> --json'];
     static flags = {
         json: Flags.boolean({
             description: 'Output the result as JSON',
@@ -25,6 +22,7 @@ export default class SkillsCheck extends Command {
     async run() {
         const { flags } = await this.parse(SkillsCheck);
         const status = await inspectSkillsStatus();
+        const displaySkillNames = status.packageSkillNames.length ? status.packageSkillNames : status.installedSkillNames;
         if (flags.json) {
             this.log(JSON.stringify({
                 ok: true,
@@ -35,6 +33,7 @@ export default class SkillsCheck extends Command {
                 managedByNb: status.managedByNb,
                 sourcePackage: status.sourcePackage,
                 npmPackageName: status.npmPackageName,
+                packageSkillNames: status.packageSkillNames,
                 installedSkillNames: status.installedSkillNames,
                 installedVersion: status.installedVersion,
                 latestVersion: status.latestVersion,
@@ -50,7 +49,7 @@ export default class SkillsCheck extends Command {
             ['Skills home', status.globalRoot],
             ['Installed', status.installed ? 'yes' : 'no'],
             ['Managed by nb', status.managedByNb ? 'yes' : 'no'],
-            ['Installed skills', status.installedSkillNames.length ? status.installedSkillNames.join(', ') : '(none)'],
+            ['Installed skills', displaySkillNames.length ? displaySkillNames.join(', ') : '(none)'],
             ['Installed version', status.installedVersion ?? '(unknown)'],
             ['Latest version', status.latestVersion ?? '(unknown)'],
             ['Update available', status.updateAvailable === null ? 'unknown' : status.updateAvailable ? 'yes' : 'no'],

package/dist/commands/skills/install.js

@@ -16,6 +16,7 @@ export default class SkillsInstall extends Command {
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --yes',
+        '<%= config.bin %> <%= command.id %> --version 1.0.4',
         '<%= config.bin %> <%= command.id %> --json',
     ];
     static flags = {
@@ -32,6 +33,9 @@ export default class SkillsInstall extends Command {
             description: 'Show detailed install output',
             default: false,
         }),
+        version: Flags.string({
+            description: 'Install a specific @nocobase/skills version',
+        }),
     };
     async run() {
         const { flags } = await this.parse(SkillsInstall);
@@ -52,6 +56,7 @@ export default class SkillsInstall extends Command {
             }
         }
         const result = await installNocoBaseSkills({
+            targetVersion: flags.version,
             verbose: flags.verbose,
         });
         if (flags.json) {

package/dist/commands/skills/update.js

@@ -8,7 +8,7 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { confirm } from "../../lib/inquirer.js";
-import { setVerboseMode } from '../../lib/ui.js';
+import { setVerboseMode, startTask, stopTask } from '../../lib/ui.js';
 import { updateNocoBaseSkills } from '../../lib/skills-manager.js';
 export default class SkillsUpdate extends Command {
     static summary = 'Update the globally installed NocoBase AI coding skills';
@@ -16,6 +16,7 @@ export default class SkillsUpdate extends Command {
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --yes',
+        '<%= config.bin %> <%= command.id %> --version 1.0.4',
         '<%= config.bin %> <%= command.id %> --json',
     ];
     static flags = {
@@ -32,6 +33,9 @@ export default class SkillsUpdate extends Command {
             description: 'Show detailed update output',
             default: false,
         }),
+        version: Flags.string({
+            description: 'Sync to a specific @nocobase/skills version',
+        }),
     };
     async run() {
         const { flags } = await this.parse(SkillsUpdate);
@@ -51,8 +55,19 @@ export default class SkillsUpdate extends Command {
                 return;
             }
         }
+        const shouldShowLoading = !flags.json && !flags.verbose;
+        if (shouldShowLoading) {
+            startTask(flags.version
+                ? `Syncing NocoBase AI coding skills to ${flags.version}...`
+                : 'Updating NocoBase AI coding skills...');
+        }
         const result = await updateNocoBaseSkills({
+            targetVersion: flags.version,
             verbose: flags.verbose,
+        }).finally(() => {
+            if (shouldShowLoading) {
+                stopTask();
+            }
         });
         if (flags.json) {
             this.log(JSON.stringify({
@@ -80,8 +95,6 @@ export default class SkillsUpdate extends Command {
                 : 'NocoBase AI coding skills are up to date.');
             return;
         }
-        this.log(flags.verbose
-            ? 'Updated the global NocoBase AI coding skills.'
-            : 'Updated NocoBase AI coding skills globally.');
+        this.log(flags.verbose ? 'Updated the global NocoBase AI coding skills.' : 'Updated NocoBase AI coding skills globally.');
     }
 }

package/dist/lib/api-command-compat.js

@@ -114,12 +114,22 @@ function compareWithOperator(version, operator, expected) {
 }
 function normalizeAppByChannelComparableVersion(version) {
     const normalized = String(version ?? '').trim();
-    const match = normalized.match(/^(\d+\.\d+\.\d+)-(alpha|beta|rc)(?:\.(\d+))?(?:\..+)?$/);
+    const match = normalized.match(/^(\d+\.\d+\.\d+)(?:-([0-9A-Za-z-.]+))?$/);
     if (!match) {
         return normalized;
     }
-    const [, base, channel, sequence] = match;
-    return sequence ? `${base}-${channel}.${sequence}` : `${base}-${channel}`;
+    const [, base, prerelease] = match;
+    if (!prerelease) {
+        return base;
+    }
+    const [channel, sequence] = prerelease.split('.');
+    if ((channel === 'alpha' || channel === 'beta') && sequence && /^\d+$/.test(sequence)) {
+        return `${base}-${channel}.${sequence}`;
+    }
+    if (channel === 'alpha' || channel === 'beta') {
+        return `${base}-${channel}`;
+    }
+    return base;
 }
 function normalizeAppByChannelCondition(condition) {
     if (!condition) {
@@ -134,6 +144,42 @@ function normalizeAppByChannelCondition(condition) {
     }
     return normalized;
 }
+function compareAppByChannelVersions(version, expected) {
+    const comparableVersion = normalizeAppByChannelComparableVersion(version);
+    const comparableExpected = normalizeAppByChannelComparableVersion(expected);
+    if (comparableVersion === comparableExpected ||
+        comparableVersion.startsWith(`${comparableExpected}.`) ||
+        comparableVersion.startsWith(`${comparableExpected}-`)) {
+        return 0;
+    }
+    return compareVersions(comparableVersion, comparableExpected);
+}
+function compareAppByChannelWithOperator(version, operator, expected) {
+    const compared = compareAppByChannelVersions(version, expected);
+    switch (operator) {
+        case 'eq':
+            return compared === 0;
+        case 'gt':
+            return compared > 0;
+        case 'gte':
+            return compared >= 0;
+        case 'lt':
+            return compared < 0;
+        case 'lte':
+            return compared <= 0;
+        default:
+            return false;
+    }
+}
+function matchesAppByChannelVersionCondition(version, condition) {
+    if (!condition) {
+        return true;
+    }
+    return ['eq', 'gt', 'gte', 'lt', 'lte'].every((operator) => {
+        const expected = condition[operator];
+        return expected ? compareAppByChannelWithOperator(version, operator, expected) : true;
+    });
+}
 function matchesVersionCondition(version, condition) {
     if (!condition) {
         return true;
@@ -168,10 +214,7 @@ function resolveAppChannel(version) {
     if (channel === 'beta') {
         return 'beta';
     }
-    if (channel === 'rc') {
-        return 'rc';
-    }
-    return 'unknownPrerelease';
+    return 'stable';
 }
 function evaluateAppByChannelCondition(version, condition) {
     if (!condition) {
@@ -208,7 +251,7 @@ function evaluateAppByChannelCondition(version, condition) {
     const comparableVersion = normalizeAppByChannelComparableVersion(version);
     const comparableCondition = normalizeAppByChannelCondition(channelCondition);
     return {
-        result: matchesVersionCondition(comparableVersion, comparableCondition) ? 'match' : 'mismatch',
+        result: matchesAppByChannelVersionCondition(comparableVersion, comparableCondition) ? 'match' : 'mismatch',
         channel,
         condition: channelCondition,
     };

package/dist/lib/skills-manager.js

@@ -154,10 +154,13 @@ export async function listGlobalSkills(options = {}) {
 export async function listProjectSkills(options = {}) {
     return await listGlobalSkills(options);
 }
-function pickInstalledNocoBaseSkillNames(installedSkills, state) {
+function pickInstalledNocoBaseSkillNames(installedSkills, state, sourceSkillNames = []) {
     const installedNames = new Set(installedSkills.map((skill) => String(skill.name ?? '').trim()).filter(Boolean));
-    if (state?.skillNames?.length) {
-        return state.skillNames.filter((name) => installedNames.has(name)).sort();
+    const managedNames = new Set([...sourceSkillNames, ...(state?.skillNames ?? [])]);
+    if (managedNames.size > 0) {
+        return Array.from(managedNames)
+            .filter((name) => installedNames.has(name))
+            .sort();
     }
     return Array.from(installedNames)
         .filter((name) => name.startsWith(NOCOBASE_SKILLS_NAME_PREFIX))
@@ -194,6 +197,31 @@ async function readCachedSkillsVersion(cacheRoot) {
         return undefined;
     }
 }
+async function readCachedPackageSkillNames(globalRoot) {
+    const skillsDir = path.join(getCachedSkillsPackageDir(getSkillsCacheRoot(globalRoot)), 'skills');
+    try {
+        const entries = await fsp.readdir(skillsDir, { withFileTypes: true });
+        const skillNames = await Promise.all(entries
+            .filter((entry) => entry.isDirectory())
+            .map(async (entry) => {
+            const skillName = entry.name.trim();
+            if (!skillName) {
+                return undefined;
+            }
+            try {
+                await fsp.access(path.join(skillsDir, skillName, 'SKILL.md'));
+                return skillName;
+            }
+            catch {
+                return undefined;
+            }
+        }));
+        return skillNames.filter((name) => Boolean(name)).sort();
+    }
+    catch {
+        return [];
+    }
+}
 async function resolvePackedSkillsTarball(packRoot) {
     const entries = await fsp.readdir(packRoot, { withFileTypes: true });
     const tarballs = entries
@@ -279,14 +307,16 @@ async function prepareLocalSkillsPackage(globalRoot, options = {}, targetVersion
 export async function inspectSkillsStatus(options = {}) {
     const globalRoot = resolveSkillsRoot(options);
     const stateFile = getManagedSkillsStateFile(globalRoot);
-    const [installedSkills, managedState] = await Promise.all([
+    const [installedSkills, managedState, cachedSkillNames] = await Promise.all([
         listGlobalSkills({
             globalRoot,
             commandOutputFn: options.commandOutputFn,
         }),
         readManagedSkillsState(globalRoot),
+        readCachedPackageSkillNames(globalRoot),
     ]);
-    const installedSkillNames = pickInstalledNocoBaseSkillNames(installedSkills, managedState);
+    const installedSkillNames = pickInstalledNocoBaseSkillNames(installedSkills, managedState, cachedSkillNames);
+    const packageSkillNames = cachedSkillNames;
     const managedByNb = managedState?.packageName === NOCOBASE_SKILLS_PACKAGE_NAME;
     let latestVersion;
     let registryError;
@@ -312,6 +342,7 @@ export async function inspectSkillsStatus(options = {}) {
         managedByNb,
         sourcePackage: managedState?.sourcePackage ?? NOCOBASE_SKILLS_SOURCE,
         npmPackageName: managedState?.packageName ?? NOCOBASE_SKILLS_PACKAGE_NAME,
+        packageSkillNames,
         installedSkillNames,
         latestVersion,
         installedVersion,
@@ -321,13 +352,18 @@ export async function inspectSkillsStatus(options = {}) {
         registryError,
     };
 }
-async function persistManagedSkillsState(globalRoot, options = {}) {
-    const installedSkills = await listGlobalSkills({
-        globalRoot,
-        commandOutputFn: options.commandOutputFn,
-    });
-    const managedState = await readManagedSkillsState(globalRoot);
-    const installedSkillNames = pickInstalledNocoBaseSkillNames(installedSkills, managedState);
+async function persistManagedSkillsState(globalRoot, options = {}, installedVersion) {
+    const [installedSkills, managedState, cachedSkillNames] = await Promise.all([
+        listGlobalSkills({
+            globalRoot,
+            commandOutputFn: options.commandOutputFn,
+        }),
+        readManagedSkillsState(globalRoot),
+        readCachedPackageSkillNames(globalRoot),
+    ]);
+    const installedSkillNames = pickInstalledNocoBaseSkillNames(installedSkills, managedState, cachedSkillNames);
+    const packageSkillNames = cachedSkillNames.length ? cachedSkillNames : installedSkillNames;
+    const cachedVersion = await readCachedSkillsVersion(getSkillsCacheRoot(globalRoot));
     const published = await readPublishedSkillsVersion({
         globalRoot,
         commandOutputFn: options.commandOutputFn,
@@ -338,8 +374,8 @@ async function persistManagedSkillsState(globalRoot, options = {}) {
         sourcePackage: NOCOBASE_SKILLS_SOURCE,
         installedAt: managedState?.installedAt ?? now,
         updatedAt: now,
-        installedVersion: published.version,
-        skillNames: installedSkillNames,
+        installedVersion: installedVersion ?? cachedVersion ?? published.version,
+        skillNames: packageSkillNames,
     });
     return await inspectSkillsStatus({
         globalRoot,
@@ -349,7 +385,7 @@ async function persistManagedSkillsState(globalRoot, options = {}) {
 async function reinstallManagedSkills(globalRoot, options = {}, targetVersion) {
     const prepared = await prepareLocalSkillsPackage(globalRoot, options, targetVersion);
     try {
-        await (options.runFn ?? run)('npx', ['-y', 'skills', 'add', prepared.packageDir, '-g', '-y'], {
+        await (options.runFn ?? run)('npx', ['-y', 'skills', 'add', prepared.packageDir, '-g', '-y', '--skill', '*'], {
             cwd: globalRoot,
             stdio: options.verbose ? 'inherit' : 'ignore',
             errorName: 'skills add',
@@ -360,23 +396,50 @@ async function reinstallManagedSkills(globalRoot, options = {}, targetVersion) {
         await prepared.cleanup();
     }
 }
+function pickObsoleteManagedSkillNames(installedSkillNames, packageSkillNames) {
+    if (!packageSkillNames.length) {
+        return [];
+    }
+    const packageSkillNameSet = new Set(packageSkillNames);
+    return installedSkillNames.filter((skillName) => !packageSkillNameSet.has(skillName)).sort();
+}
+async function removeObsoleteManagedSkills(globalRoot, installedSkillNames, options = {}) {
+    const packageSkillNames = await readCachedPackageSkillNames(globalRoot);
+    const obsoleteSkillNames = pickObsoleteManagedSkillNames(installedSkillNames, packageSkillNames);
+    for (const skillName of obsoleteSkillNames) {
+        await (options.runFn ?? run)('npx', ['-y', 'skills', 'remove', skillName, '-g', '-y'], {
+            cwd: globalRoot,
+            stdio: options.verbose ? 'inherit' : 'ignore',
+            errorName: 'skills remove',
+        });
+    }
+}
 export async function installNocoBaseSkills(options = {}) {
     const globalRoot = resolveSkillsRoot(options);
     const status = await inspectSkillsStatus({
         globalRoot,
         commandOutputFn: options.commandOutputFn,
     });
-    if (status.installed) {
+    const cachedSkillNames = await readCachedPackageSkillNames(globalRoot);
+    const missingCachedSkillNames = cachedSkillNames.filter((name) => !status.installedSkillNames.includes(name));
+    const obsoleteSkillNames = pickObsoleteManagedSkillNames(status.installedSkillNames, cachedSkillNames);
+    const targetVersion = String(options.targetVersion ?? '').trim() || undefined;
+    const targetVersionMatches = !targetVersion || status.installedVersion === targetVersion;
+    if (status.installed && targetVersionMatches && missingCachedSkillNames.length === 0 && obsoleteSkillNames.length === 0) {
         return {
             action: 'noop',
             status,
         };
     }
     await ensureSkillsWorkspaceRoot(globalRoot);
-    await reinstallManagedSkills(globalRoot, options, status.latestVersion);
+    if (!status.installed || !targetVersionMatches || missingCachedSkillNames.length > 0) {
+        const installVersion = targetVersion ?? status.latestVersion;
+        await reinstallManagedSkills(globalRoot, options, installVersion);
+    }
+    await removeObsoleteManagedSkills(globalRoot, status.installedSkillNames, options);
     return {
         action: 'installed',
-        status: await persistManagedSkillsState(globalRoot, options),
+        status: await persistManagedSkillsState(globalRoot, options, targetVersion),
     };
 }
 export async function updateNocoBaseSkills(options = {}) {
@@ -385,6 +448,10 @@ export async function updateNocoBaseSkills(options = {}) {
         globalRoot,
         commandOutputFn: options.commandOutputFn,
     });
+    const cachedSkillNames = await readCachedPackageSkillNames(globalRoot);
+    const missingCachedSkillNames = cachedSkillNames.filter((name) => !status.installedSkillNames.includes(name));
+    const obsoleteSkillNames = pickObsoleteManagedSkillNames(status.installedSkillNames, cachedSkillNames);
+    const targetVersion = String(options.targetVersion ?? '').trim() || undefined;
     if (!status.installed) {
         return {
             action: 'noop',
@@ -393,8 +460,11 @@ export async function updateNocoBaseSkills(options = {}) {
         };
     }
     if (status.managedByNb &&
+        !targetVersion &&
         status.latestVersion &&
         status.installedVersion &&
+        missingCachedSkillNames.length === 0 &&
+        obsoleteSkillNames.length === 0 &&
         compareVersions(status.latestVersion, status.installedVersion) <= 0) {
         return {
             action: 'noop',
@@ -402,10 +472,24 @@ export async function updateNocoBaseSkills(options = {}) {
             status,
         };
     }
-    await reinstallManagedSkills(globalRoot, options, status.latestVersion);
+    if (targetVersion &&
+        status.installedVersion === targetVersion &&
+        missingCachedSkillNames.length === 0 &&
+        obsoleteSkillNames.length === 0) {
+        return {
+            action: 'noop',
+            reason: 'up-to-date',
+            status,
+        };
+    }
+    if (!targetVersion || status.installedVersion !== targetVersion || missingCachedSkillNames.length > 0) {
+        const installVersion = targetVersion ?? status.latestVersion;
+        await reinstallManagedSkills(globalRoot, options, installVersion);
+    }
+    await removeObsoleteManagedSkills(globalRoot, status.installedSkillNames, options);
     return {
         action: 'updated',
-        status: await persistManagedSkillsState(globalRoot, options),
+        status: await persistManagedSkillsState(globalRoot, options, targetVersion),
     };
 }
 export async function removeNocoBaseSkills(options = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -143,5 +143,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "e1b28561425c5c34ff3bc6ae1f81c66b72f02872"
+  "gitHead": "f61e75119a74bbac25879f4edb8cf9913c99098a"
 }