@botskill/cli 1.0.5 → 1.0.7

package/package.json

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

package/src/commands/pack.js

@@ -0,0 +1,57 @@
+import { Command } from 'commander';
+import path from 'path';
+import fs from 'fs-extra';
+import { packDirectory } from '../lib/packSkill.js';
+import { printSimpleError } from '../lib/formatError.js';
+
+const packCommand = new Command('pack');
+packCommand
+  .description('Pack current or specified directory into upload format (skill.zip)')
+  .argument('[path]', 'Directory to pack (default: current directory)')
+  .option('-o, --output <file>', 'Output file path (default: skill.zip in source directory)')
+  .option('--dry-run', 'Validate only, do not create zip')
+  .action(async (pathArg, options) => {
+    const cwd = process.cwd();
+    const dirPath = pathArg ? path.resolve(cwd, pathArg) : cwd;
+
+    if (!(await fs.pathExists(dirPath))) {
+      printSimpleError('Directory not found', dirPath);
+    }
+
+    const stat = await fs.stat(dirPath);
+    if (!stat.isDirectory()) {
+      printSimpleError('Not a directory', dirPath);
+    }
+
+    const skillMdPath = path.join(dirPath, 'SKILL.md');
+    if (!(await fs.pathExists(skillMdPath))) {
+      printSimpleError('SKILL.md not found', 'Create SKILL.md in the directory first');
+    }
+
+    if (options.dryRun) {
+      const { getConfigFromDir } = await import('../lib/packSkill.js');
+      const { name, version } = await getConfigFromDir(dirPath).catch(() => ({ name: 'skill', version: '1.0.0' }));
+      const toSafe = (s) => String(s || 'skill').toLowerCase().replace(/[^a-z0-9.-]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '') || 'skill';
+      const defaultOutput = path.join(dirPath, `${toSafe(name)}-${String(version || '1.0.0').replace(/[^a-zA-Z0-9.-]/g, '-')}.zip`);
+      console.log('[DRY RUN] Would pack:', dirPath);
+      console.log('[DRY RUN] Output:', options.output || defaultOutput);
+      return;
+    }
+
+    try {
+      const outputPath = await packDirectory(dirPath, { output: options.output });
+      console.log('Packed successfully!');
+      console.log(`Output: ${outputPath}`);
+      console.log('\nUse "skm push" or "skm push -f <path>" to upload.');
+    } catch (err) {
+      if (err.message === 'NO_SKILL_MD') {
+        printSimpleError('SKILL.md not found', 'Create SKILL.md in the directory first');
+      } else if (err.message === 'FILE_NOT_FOUND') {
+        printSimpleError('Directory not found', dirPath);
+      } else {
+        printSimpleError(err.message || 'Pack failed');
+      }
+    }
+  });
+
+export { packCommand };

package/src/commands/publish.js

@@ -4,11 +4,13 @@ import fs from 'fs-extra';
 import { getToken } from '../lib/auth.js';
 import { printApiError, printSimpleError } from '../lib/formatError.js';
 import { uploadSkillFile, findUploadFile } from '../lib/uploadSkill.js';
+import { packDirectory } from '../lib/packSkill.js';
 
 const publishCommand = new Command('publish');
 publishCommand
   .description('Publish a skill to BotSkill (alias for push)')
   .option('-f, --file <path>', 'Path to SKILL.md, .zip, or .tar.gz')
+  .option('--config-dir <path>', 'Directory containing skill.config.json (default: same as file)')
   .option('--dry-run', 'Validate without uploading')
   .option('--api-url <url>', 'API base URL (overrides config for this command)')
   .action(async (options, command) => {
@@ -32,14 +34,37 @@ publishCommand
       }
     }
 
-    if (options.dryRun) {
+    const configDir = options.configDir ? path.resolve(options.configDir) : path.dirname(path.resolve(filePath));
+    let tempPackPath = null;
+    let uploadPath = filePath;
+
+    const isSkillMd = filePath.toLowerCase().endsWith('.md') || path.basename(filePath) === 'SKILL.md';
+    if (isSkillMd) {
+      const dirPath = path.dirname(path.resolve(filePath));
+      if (options.dryRun) {
+        console.log('[DRY RUN] Would pack directory to temp (skill-{version}.zip) and upload');
+        console.log('[DRY RUN] Source:', path.resolve(filePath));
+        return;
+      }
+      try {
+        tempPackPath = await packDirectory(dirPath, { useTempDir: true });
+        uploadPath = tempPackPath;
+      } catch (err) {
+        if (err.message === 'NO_SKILL_MD') {
+          printSimpleError('SKILL.md not found', 'Create SKILL.md in the directory first');
+        } else {
+          printSimpleError(err.message || 'Pack failed');
+        }
+        process.exit(1);
+      }
+    } else if (options.dryRun) {
       console.log('[DRY RUN] Would publish:', path.resolve(filePath));
       return;
     }
 
-    console.log(`Publishing skill from ${path.basename(filePath)}...`);
+    console.log(`Publishing skill from ${path.basename(uploadPath)}...`);
     try {
-      const skill = await uploadSkillFile(filePath, { apiUrl });
+      const skill = await uploadSkillFile(uploadPath, { apiUrl, configDir });
       console.log('Skill published successfully!');
       console.log(`Name: ${skill?.name}`);
       console.log(`Version: ${skill?.version || (skill?.versions?.[0]?.version)}`);
@@ -48,13 +73,19 @@ publishCommand
       if (err.message === 'NOT_LOGGED_IN') {
         printSimpleError('Not logged in', 'Run "skm login" first');
       } else if (err.message === 'FILE_NOT_FOUND') {
-        printSimpleError('File not found', 'Check the path with --file <path>');
+        printSimpleError('File not found', uploadPath);
       } else {
         const msg = err.response?.data?.error || err.response?.data?.details?.[0];
         if (msg) err._overrideMsg = msg;
         if (err.response?.status === 401) err._overrideMsg = 'Token expired or invalid. Run "skm login" first.';
         printApiError(err, { prefix: 'Publish failed' });
       }
+    } finally {
+      if (tempPackPath) {
+        try {
+          await fs.remove(path.dirname(tempPackPath));
+        } catch (_) {}
+      }
     }
   });
 

package/src/commands/push.js

@@ -3,12 +3,14 @@ import path from 'path';
 import fs from 'fs-extra';
 import { getToken } from '../lib/auth.js';
 import { printApiError, printSimpleError } from '../lib/formatError.js';
-import { uploadSkillFile, findUploadFile, validCategories } from '../lib/uploadSkill.js';
+import { uploadSkillFile, findUploadFile } from '../lib/uploadSkill.js';
+import { packDirectory } from '../lib/packSkill.js';
 
 const pushCommand = new Command('push');
 pushCommand
   .description('Upload/push a skill to BotSkill (SKILL.md, .zip, or .tar.gz)')
   .option('-f, --file <path>', 'Path to SKILL.md, .zip, or .tar.gz')
+  .option('--config-dir <path>', 'Directory containing skill.config.json (default: same as file)')
   .option('--dry-run', 'Validate without uploading')
   .option('--api-url <url>', 'API base URL')
   .action(async (options, command) => {
@@ -32,14 +34,38 @@ pushCommand
       }
     }
 
-    if (options.dryRun) {
+    const configDir = options.configDir ? path.resolve(options.configDir) : path.dirname(path.resolve(filePath));
+    let tempPackPath = null;
+    let uploadPath = filePath;
+
+    // 当源是 SKILL.md 时，打包到临时目录并加上版本号
+    const isSkillMd = filePath.toLowerCase().endsWith('.md') || path.basename(filePath) === 'SKILL.md';
+    if (isSkillMd) {
+      const dirPath = path.dirname(path.resolve(filePath));
+      if (options.dryRun) {
+        console.log('[DRY RUN] Would pack directory to temp (skill-{version}.zip) and upload');
+        console.log('[DRY RUN] Source:', path.resolve(filePath));
+        return;
+      }
+      try {
+        tempPackPath = await packDirectory(dirPath, { useTempDir: true });
+        uploadPath = tempPackPath;
+      } catch (err) {
+        if (err.message === 'NO_SKILL_MD') {
+          printSimpleError('SKILL.md not found', 'Create SKILL.md in the directory first');
+        } else {
+          printSimpleError(err.message || 'Pack failed');
+        }
+        process.exit(1);
+      }
+    } else if (options.dryRun) {
       console.log('[DRY RUN] Would upload:', path.resolve(filePath));
       return;
     }
 
-    console.log(`Pushing skill from ${path.basename(filePath)}...`);
+    console.log(`Pushing skill from ${path.basename(uploadPath)}...`);
     try {
-      const skill = await uploadSkillFile(filePath, { apiUrl });
+      const skill = await uploadSkillFile(uploadPath, { apiUrl, configDir });
       console.log('Skill uploaded successfully!');
       console.log(`Name: ${skill?.name}`);
       console.log(`Version: ${skill?.version || (skill?.versions?.[0]?.version)}`);
@@ -48,13 +74,19 @@ pushCommand
       if (err.message === 'NOT_LOGGED_IN') {
         printSimpleError('Not logged in', 'Run "skm login" first');
       } else if (err.message === 'FILE_NOT_FOUND') {
-        printSimpleError('File not found', 'Check the path with --file <path>');
+        printSimpleError('File not found', uploadPath);
       } else {
         const msg = err.response?.data?.error || err.response?.data?.details?.[0];
         if (msg) err._overrideMsg = msg;
         if (err.response?.status === 401) err._overrideMsg = 'Token expired or invalid. Run "skm login" first.';
         printApiError(err, { prefix: 'Push failed' });
       }
+    } finally {
+      if (tempPackPath) {
+        try {
+          await fs.remove(path.dirname(tempPackPath));
+        } catch (_) {}
+      }
     }
   });
 

package/src/index.js

@@ -9,6 +9,7 @@ import { loginCommand } from './commands/login.js';
 import { logoutCommand } from './commands/logout.js';
 import { configCommand } from './commands/config.js';
 import { getCommand } from './commands/get.js';
+import { packCommand } from './commands/pack.js';
 import { pushCommand } from './commands/push.js';
 import { publishCommand } from './commands/publish.js';
 import { listCommand } from './commands/list.js';
@@ -36,6 +37,7 @@ program.addCommand(loginCommand);
 program.addCommand(logoutCommand);
 program.addCommand(configCommand);
 program.addCommand(getCommand);
+program.addCommand(packCommand);
 program.addCommand(pushCommand);
 program.addCommand(publishCommand);
 program.addCommand(listCommand);

package/src/lib/packSkill.js

@@ -0,0 +1,97 @@
+import path from 'path';
+import os from 'os';
+import fs from 'fs-extra';
+import AdmZip from 'adm-zip';
+
+const DEFAULT_EXCLUDE = [
+  'node_modules',
+  '.git',
+  '.DS_Store',
+  'skill.zip',
+  'skill.tar.gz',
+  'dist.zip',
+];
+
+/**
+ * Create filter that excludes common unwanted paths
+ */
+function createExcludeFilter(exclude = DEFAULT_EXCLUDE) {
+  const patterns = exclude.map((p) => p.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+  const re = new RegExp(`(^|/)(${patterns.join('|')})(/|$)`, 'i');
+  return (zipPath) => !re.test(zipPath.replace(/\\/g, '/'));
+}
+
+/**
+ * Get name and version from skill.config.json in directory
+ */
+export async function getConfigFromDir(dirPath) {
+  const configPath = path.join(dirPath, 'skill.config.json');
+  const defaultValue = { name: 'skill', version: '1.0.0' };
+  if (!(await fs.pathExists(configPath))) return defaultValue;
+  try {
+    const config = await fs.readJson(configPath);
+    return {
+      name: config.name || 'skill',
+      version: config.version || '1.0.0',
+    };
+  } catch {
+    return defaultValue;
+  }
+}
+
+function toSafeId(str) {
+  return String(str || 'skill')
+    .toLowerCase()
+    .replace(/[^a-z0-9.-]/g, '-')
+    .replace(/-+/g, '-')
+    .replace(/^-|-$/g, '') || 'skill';
+}
+
+/**
+ * Pack a directory into skill.zip format for upload
+ * @param {string} dirPath - Directory to pack (must contain SKILL.md)
+ * @param {Object} [opts]
+ * @param {string} [opts.output] - Output file path (default: skill.zip in dirPath)
+ * @param {string} [opts.version] - Version for filename when using tempDir
+ * @param {boolean} [opts.useTempDir] - If true, output to temp dir with skill-{version}.zip
+ * @param {string[]} [opts.exclude] - Additional paths to exclude
+ * @returns {Promise<string>} Path to created zip file
+ */
+export async function packDirectory(dirPath, opts = {}) {
+  const resolved = path.resolve(dirPath);
+  if (!(await fs.pathExists(resolved))) {
+    throw new Error('FILE_NOT_FOUND');
+  }
+  const stat = await fs.stat(resolved);
+  if (!stat.isDirectory()) {
+    throw new Error('NOT_DIRECTORY');
+  }
+
+  const skillMdPath = path.join(resolved, 'SKILL.md');
+  if (!(await fs.pathExists(skillMdPath))) {
+    throw new Error('NO_SKILL_MD');
+  }
+
+  const { name, version } = await getConfigFromDir(resolved);
+  const safeName = toSafeId(opts.name ?? name);
+  const safeVersion = String(opts.version ?? version).replace(/[^a-zA-Z0-9.-]/g, '-');
+  const defaultFilename = `${safeName}-${safeVersion}.zip`;
+
+  let outputPath;
+  if (opts.output) {
+    outputPath = path.resolve(opts.output);
+  } else if (opts.useTempDir) {
+    const tmpDir = path.join(os.tmpdir(), `skm-pack-${Date.now()}-${Math.random().toString(36).slice(2)}`);
+    await fs.ensureDir(tmpDir);
+    outputPath = path.join(tmpDir, defaultFilename);
+  } else {
+    outputPath = path.join(resolved, defaultFilename);
+  }
+  const excludeFilter = createExcludeFilter(opts.exclude);
+
+  const zip = new AdmZip();
+  zip.addLocalFolder(resolved, '', (p) => excludeFilter(p.replace(/\\/g, '/')));
+  zip.writeZip(outputPath);
+
+  return outputPath;
+}

package/src/lib/uploadSkill.js

@@ -6,7 +6,7 @@ const validCategories = ['ai', 'data', 'web', 'devops', 'security', 'tools'];
 
 /**
  * Find uploadable file in cwd
- * Priority: SKILL.md, skill.zip, skill.tar.gz, dist.zip
+ * Priority: SKILL.md, skill.zip, skill.tar.gz, dist.zip, {name}-{version}.zip
  */
 export async function findUploadFile(cwd = process.cwd()) {
   const candidates = [
@@ -21,14 +21,63 @@ export async function findUploadFile(cwd = process.cwd()) {
       if (stat.isFile()) return p;
     }
   }
+  // 查找 {name}-{version}.zip 格式的打包文件
+  try {
+    const files = await fs.readdir(cwd);
+    const zipMatch = files.find((f) => /-\d+\.\d+\.\d+\.zip$/i.test(f));
+    if (zipMatch) {
+      const p = path.join(cwd, zipMatch);
+      const stat = await fs.stat(p);
+      if (stat.isFile()) return p;
+    }
+  } catch (_) {}
   return null;
 }
 
+/**
+ * Load skill.config.json from directory (same dir as file or parent)
+ */
+export async function loadSkillConfig(filePath) {
+  const dir = path.dirname(path.resolve(filePath));
+  const configPath = path.join(dir, 'skill.config.json');
+  if (!(await fs.pathExists(configPath))) return null;
+  try {
+    return await fs.readJson(configPath);
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Append skill.config.json fields to FormData (version, category, license, tags, urls)
+ */
+function appendConfigToForm(form, config) {
+  if (!config) return;
+  const fields = [
+    'version',
+    'category',
+    'license',
+    'repositoryUrl',
+    'documentationUrl',
+    'demoUrl',
+  ];
+  for (const key of fields) {
+    const val = config[key];
+    if (val !== undefined && val !== null && val !== '') {
+      form.append(key, Array.isArray(val) ? JSON.stringify(val) : String(val));
+    }
+  }
+  if (Array.isArray(config.tags) && config.tags.length > 0) {
+    form.append('tags', JSON.stringify(config.tags));
+  }
+}
+
 /**
  * Upload skill file (SKILL.md, .zip, .tar.gz) to BotSkill
  * @param {string} filePath - Path to file
  * @param {Object} [opts] - 可选
  * @param {string} [opts.apiUrl] - 覆盖 API 地址（来自 --api-url）
+ * @param {string} [opts.configDir] - 指定读取 skill.config.json 的目录（默认与文件同目录）
  */
 export async function uploadSkillFile(filePath, opts = {}) {
   const token = getToken();
@@ -46,6 +95,15 @@ export async function uploadSkillFile(filePath, opts = {}) {
     filename: path.basename(filePath),
   });
 
+  const configDir = opts.configDir ?? path.dirname(path.resolve(filePath));
+  const configPath = path.join(configDir, 'skill.config.json');
+  if (await fs.pathExists(configPath)) {
+    try {
+      const config = await fs.readJson(configPath);
+      appendConfigToForm(form, config);
+    } catch (_) {}
+  }
+
   const api = createApiClient(opts.apiUrl);
   const res = await api.post('/skills/upload', form, {
     headers: form.getHeaders(),