@nocobase/cli 2.1.4-rc.1 → 2.1.4-rc.2

package/dist/commands/skills/install.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, updateTask } from '../../lib/ui.js';
 import { installNocoBaseSkills } from '../../lib/skills-manager.js';
 export default class SkillsInstall extends Command {
     static summary = 'Install the NocoBase AI coding skills globally';
@@ -17,6 +17,7 @@ export default class SkillsInstall extends Command {
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --yes',
         '<%= config.bin %> <%= command.id %> --version 1.0.4',
+        '<%= config.bin %> <%= command.id %> --verbose',
         '<%= config.bin %> <%= command.id %> --json',
     ];
     static flags = {
@@ -55,9 +56,20 @@ export default class SkillsInstall extends Command {
                 return;
             }
         }
+        const shouldShowLoading = !flags.json && !flags.verbose;
+        if (shouldShowLoading) {
+            startTask(flags.version
+                ? `Installing NocoBase AI coding skills ${flags.version}...`
+                : 'Installing NocoBase AI coding skills...');
+        }
         const result = await installNocoBaseSkills({
             targetVersion: flags.version,
             verbose: flags.verbose,
+            onProgress: shouldShowLoading ? updateTask : undefined,
+        }).finally(() => {
+            if (shouldShowLoading) {
+                stopTask();
+            }
         });
         if (flags.json) {
             this.log(JSON.stringify({

package/dist/commands/skills/update.js

@@ -8,7 +8,7 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { confirm } from "../../lib/inquirer.js";
-import { setVerboseMode, startTask, stopTask } from '../../lib/ui.js';
+import { setVerboseMode, startTask, stopTask, updateTask } 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';
@@ -17,6 +17,7 @@ export default class SkillsUpdate extends Command {
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --yes',
         '<%= config.bin %> <%= command.id %> --version 1.0.4',
+        '<%= config.bin %> <%= command.id %> --verbose',
         '<%= config.bin %> <%= command.id %> --json',
     ];
     static flags = {
@@ -64,6 +65,7 @@ export default class SkillsUpdate extends Command {
         const result = await updateNocoBaseSkills({
             targetVersion: flags.version,
             verbose: flags.verbose,
+            onProgress: shouldShowLoading ? updateTask : undefined,
         }).finally(() => {
             if (shouldShowLoading) {
                 stopTask();

package/dist/lib/skills-manager.js

@@ -21,8 +21,8 @@ const NOCOBASE_SKILLS_NAME_PREFIX = 'nocobase-';
 // resolves and boots the package, even when the local skills installation is healthy.
 const SKILLS_LIST_TIMEOUT_MS = 15000;
 const SKILLS_NPM_VIEW_TIMEOUT_MS = 3000;
-const SKILLS_PACK_TIMEOUT_MS = 30000;
-const SKILLS_ADD_TIMEOUT_MS = 20000;
+const SKILLS_PACK_TIMEOUT_MS = 120000;
+const SKILLS_ADD_TIMEOUT_MS = 120000;
 const NPM_REGISTRY_UNAVAILABLE_PATTERNS = [
     'enotfound',
     'eai_again',
@@ -279,6 +279,7 @@ async function prepareLocalSkillsPackage(globalRoot, options = {}, targetVersion
     const cachedVersion = await readCachedSkillsVersion(cacheRoot);
     await fsp.mkdir(cacheRoot, { recursive: true });
     if (targetVersion && cachedVersion && compareVersions(cachedVersion, targetVersion) === 0) {
+        options.onProgress?.(`Using cached ${NOCOBASE_SKILLS_PACKAGE_NAME}@${targetVersion}...`);
         return {
             packageDir,
             cleanup: async () => undefined,
@@ -287,12 +288,14 @@ async function prepareLocalSkillsPackage(globalRoot, options = {}, targetVersion
     await fsp.rm(packRoot, { recursive: true, force: true });
     await fsp.mkdir(packRoot, { recursive: true });
     try {
-        await (options.runFn ?? run)('npm', ['pack', '--silent', packageSpec], {
+        options.onProgress?.(`Downloading ${packageSpec}...`);
+        await (options.runFn ?? run)('npm', ['pack', ...(options.verbose ? [] : ['--silent']), packageSpec], {
             cwd: packRoot,
             stdio: options.verbose ? 'inherit' : 'ignore',
             errorName: 'npm pack',
             timeoutMs: SKILLS_PACK_TIMEOUT_MS,
         });
+        options.onProgress?.(`Extracting ${NOCOBASE_SKILLS_PACKAGE_NAME}...`);
         const tarballPath = await resolvePackedSkillsTarball(packRoot);
         await extractPackedSkillsTarball(tarballPath, cacheRoot, targetVersion);
     }
@@ -385,6 +388,7 @@ async function persistManagedSkillsState(globalRoot, options = {}, installedVers
 async function reinstallManagedSkills(globalRoot, options = {}, targetVersion) {
     const prepared = await prepareLocalSkillsPackage(globalRoot, options, targetVersion);
     try {
+        options.onProgress?.('Installing NocoBase AI coding skills globally...');
         await (options.runFn ?? run)('npx', ['-y', 'skills', 'add', prepared.packageDir, '-g', '-y', '--skill', '*'], {
             cwd: globalRoot,
             stdio: options.verbose ? 'inherit' : 'ignore',
@@ -407,6 +411,7 @@ async function removeObsoleteManagedSkills(globalRoot, installedSkillNames, opti
     const packageSkillNames = await readCachedPackageSkillNames(globalRoot);
     const obsoleteSkillNames = pickObsoleteManagedSkillNames(installedSkillNames, packageSkillNames);
     for (const skillName of obsoleteSkillNames) {
+        options.onProgress?.(`Removing obsolete skill ${skillName}...`);
         await (options.runFn ?? run)('npx', ['-y', 'skills', 'remove', skillName, '-g', '-y'], {
             cwd: globalRoot,
             stdio: options.verbose ? 'inherit' : 'ignore',
@@ -416,6 +421,7 @@ async function removeObsoleteManagedSkills(globalRoot, installedSkillNames, opti
 }
 export async function installNocoBaseSkills(options = {}) {
     const globalRoot = resolveSkillsRoot(options);
+    options.onProgress?.('Checking installed NocoBase AI coding skills...');
     const status = await inspectSkillsStatus({
         globalRoot,
         commandOutputFn: options.commandOutputFn,
@@ -437,6 +443,7 @@ export async function installNocoBaseSkills(options = {}) {
         await reinstallManagedSkills(globalRoot, options, installVersion);
     }
     await removeObsoleteManagedSkills(globalRoot, status.installedSkillNames, options);
+    options.onProgress?.('Verifying installed NocoBase AI coding skills...');
     return {
         action: 'installed',
         status: await persistManagedSkillsState(globalRoot, options, targetVersion),
@@ -444,6 +451,7 @@ export async function installNocoBaseSkills(options = {}) {
 }
 export async function updateNocoBaseSkills(options = {}) {
     const globalRoot = resolveSkillsRoot(options);
+    options.onProgress?.('Checking installed NocoBase AI coding skills...');
     const status = await inspectSkillsStatus({
         globalRoot,
         commandOutputFn: options.commandOutputFn,
@@ -487,6 +495,7 @@ export async function updateNocoBaseSkills(options = {}) {
         await reinstallManagedSkills(globalRoot, options, installVersion);
     }
     await removeObsoleteManagedSkills(globalRoot, status.installedSkillNames, options);
+    options.onProgress?.('Verifying installed NocoBase AI coding skills...');
     return {
         action: 'updated',
         status: await persistManagedSkillsState(globalRoot, options, targetVersion),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.4-rc.1",
+  "version": "2.1.4-rc.2",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",