@botskill/cli 1.0.8 → 1.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botskill/cli",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "CLI tool for BotSkill - AI agent skills platform",
   "main": "src/index.js",
   "bin": {

package/src/commands/get.js

@@ -1,9 +1,16 @@
 import { Command } from 'commander';
 import path from 'path';
+import os from 'os';
+import fs from 'fs-extra';
 import AdmZip from 'adm-zip';
 import { createApiClient } from '../lib/auth.js';
 import { printApiError } from '../lib/formatError.js';
 
+/** 从技能名提取目录名（@author/name -> name） */
+function toDirName(name) {
+  return String(name || 'skill').replace(/^@[^/]+\//, '').trim() || 'skill';
+}
+
 /**
  * Parse specifier: name@version or name
  * Returns { name, version } for API
@@ -27,7 +34,10 @@ getCommand
   .option('--api-url <url>', 'API base URL (overrides config for this command)')
   .action(async (specifier, options, command) => {
     const apiUrl = command.optsWithGlobals().apiUrl;
-    const { name, version } = parseSpecifier(specifier);
+    const spec = (specifier || '').trim();
+    const parsed = parseSpecifier(spec);
+    const name = spec.startsWith('@') ? spec : parsed.name;
+    const version = spec.startsWith('@') ? undefined : parsed.version;
     const outputDir = path.resolve(options.output || process.cwd());
 
     if (!name) {
@@ -63,12 +73,23 @@ getCommand
       const buffer = Buffer.from(res.data);
 
       const zip = new AdmZip(buffer);
-      zip.extractAllTo(outputDir, true);
-
       const entries = zip.getEntries();
-      const skillDir = entries.find(e => e.isDirectory)?.entryName || entries[0]?.entryName?.split('/')[0] || 'skill';
-      const targetPath = path.join(outputDir, skillDir);
+      const rootDir = entries.find((e) => e.isDirectory)?.entryName?.replace(/\/$/, '') || (entries[0]?.entryName?.includes('/') ? entries[0].entryName.split('/')[0] : null);
+      const hasParentDir = rootDir != null;
 
+      const skillDirName = toDirName(skill.name);
+      const targetPath = path.join(outputDir, skillDirName);
+
+      if (hasParentDir) {
+        zip.extractAllTo(outputDir, true);
+        const extractedPath = path.join(outputDir, rootDir);
+        if (rootDir !== skillDirName) {
+          await fs.move(extractedPath, targetPath, { overwrite: true });
+        }
+      } else {
+        await fs.ensureDir(targetPath);
+        zip.extractAllTo(targetPath, true);
+      }
       console.log(`\nSkill downloaded successfully!`);
       console.log(`Location: ${targetPath}`);
     } catch (err) {

package/src/lib/updateSkill.js

@@ -51,14 +51,25 @@ export async function downloadSkillToDir(api, name, version, outputDir) {
 
   const zip = new AdmZip(buffer);
   const entries = zip.getEntries();
-  const rootEntry = entries.find(e => e.isDirectory)?.entryName || entries[0]?.entryName?.split('/')[0] || 'skill';
-  const skillDirName = rootEntry.replace(/\/$/, '');
-
+  const rootDir = entries.find((e) => e.isDirectory)?.entryName?.replace(/\/$/, '') || (entries[0]?.entryName?.includes('/') ? entries[0].entryName.split('/')[0] : null);
+  const hasParentDir = rootDir != null;
+  const skillDirName = String(skill.name || 'skill').replace(/^@[^/]+\//, '').trim() || 'skill';
   const targetPath = path.join(outputDir, skillDirName);
+
   await fs.remove(targetPath).catch(() => {});
-  zip.extractAllTo(outputDir, true);
 
-  return path.join(outputDir, skillDirName);
+  if (hasParentDir) {
+    zip.extractAllTo(outputDir, true);
+    const extractedPath = path.join(outputDir, rootDir);
+    if (rootDir !== skillDirName) {
+      await fs.move(extractedPath, targetPath, { overwrite: true });
+    }
+  } else {
+    await fs.ensureDir(targetPath);
+    zip.extractAllTo(targetPath, true);
+  }
+
+  return targetPath;
 }
 
 /**