@botskill/cli 1.0.3 → 1.0.4

package/src/commands/publish.js

@@ -1,62 +1,60 @@
-import { Command } from 'commander';
-import path from 'path';
-import fs from 'fs-extra';
-import { getToken } from '../lib/auth.js';
-import { uploadSkillFile, findUploadFile } from '../lib/uploadSkill.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('--dry-run', 'Validate without uploading')
-  .option('--api-url <url>', 'API base URL')
-  .action(async (options) => {
-    if (!getToken()) {
-      console.error('Not logged in. Run: skm login');
-      process.exit(1);
-    }
-
-    let filePath = options.file;
-    if (!filePath) {
-      filePath = await findUploadFile();
-      if (!filePath) {
-        console.error('No skill file found. Create SKILL.md or a .zip/.tar.gz package, or use --file <path>');
-        process.exit(1);
-      }
-    } else {
-      if (!await fs.pathExists(filePath)) {
-        console.error('File not found:', filePath);
-        process.exit(1);
-      }
-    }
-
-    if (options.dryRun) {
-      console.log('[DRY RUN] Would publish:', path.resolve(filePath));
-      return;
-    }
-
-    console.log(`Publishing skill from ${path.basename(filePath)}...`);
-    try {
-      const skill = await uploadSkillFile(filePath);
-      console.log('Skill published successfully!');
-      console.log(`Name: ${skill?.name}`);
-      console.log(`Version: ${skill?.version || (skill?.versions?.[0]?.version)}`);
-      console.log(`Status: ${skill?.status || 'pending_review'}`);
-    } catch (err) {
-      if (err.message === 'NOT_LOGGED_IN') {
-        console.error('Not logged in. Run: skm login');
-      } else if (err.message === 'FILE_NOT_FOUND') {
-        console.error('File not found');
-      } else {
-        const msg = err.response?.data?.error || err.response?.data?.details?.[0] || err.message || 'Publish failed';
-        if (err.response?.status === 401) {
-          console.error('Token expired or invalid. Run: skm login');
-        } else {
-          console.error('Publish failed:', msg);
-        }
-      }
-      process.exit(1);
-    }
-  });
-
-export { publishCommand };
+import { Command } from 'commander';
+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 } from '../lib/uploadSkill.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('--dry-run', 'Validate without uploading')
+  .option('--api-url <url>', 'API base URL (overrides config for this command)')
+  .action(async (options) => {
+    if (!getToken()) {
+      console.error('Not logged in. Run: skm login');
+      process.exit(1);
+    }
+
+    let filePath = options.file;
+    if (!filePath) {
+      filePath = await findUploadFile();
+      if (!filePath) {
+        console.error('No skill file found. Create SKILL.md or a .zip/.tar.gz package, or use --file <path>');
+        process.exit(1);
+      }
+    } else {
+      if (!await fs.pathExists(filePath)) {
+        console.error('File not found:', filePath);
+        process.exit(1);
+      }
+    }
+
+    if (options.dryRun) {
+      console.log('[DRY RUN] Would publish:', path.resolve(filePath));
+      return;
+    }
+
+    console.log(`Publishing skill from ${path.basename(filePath)}...`);
+    try {
+      const skill = await uploadSkillFile(filePath, { apiUrl: options.apiUrl });
+      console.log('Skill published successfully!');
+      console.log(`Name: ${skill?.name}`);
+      console.log(`Version: ${skill?.version || (skill?.versions?.[0]?.version)}`);
+      console.log(`Status: ${skill?.status || 'pending_review'}`);
+    } catch (err) {
+      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>');
+      } 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' });
+      }
+    }
+  });
+
+export { publishCommand };

package/src/commands/push.js

@@ -1,62 +1,60 @@
-import { Command } from 'commander';
-import path from 'path';
-import fs from 'fs-extra';
-import { getToken } from '../lib/auth.js';
-import { uploadSkillFile, findUploadFile, validCategories } from '../lib/uploadSkill.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('--dry-run', 'Validate without uploading')
-  .option('--api-url <url>', 'API base URL')
-  .action(async (options) => {
-    if (!getToken()) {
-      console.error('Not logged in. Run: skm login');
-      process.exit(1);
-    }
-
-    let filePath = options.file;
-    if (!filePath) {
-      filePath = await findUploadFile();
-      if (!filePath) {
-        console.error('No skill file found. Create SKILL.md or a .zip/.tar.gz package, or use --file <path>');
-        process.exit(1);
-      }
-    } else {
-      if (!await fs.pathExists(filePath)) {
-        console.error('File not found:', filePath);
-        process.exit(1);
-      }
-    }
-
-    if (options.dryRun) {
-      console.log('[DRY RUN] Would upload:', path.resolve(filePath));
-      return;
-    }
-
-    console.log(`Pushing skill from ${path.basename(filePath)}...`);
-    try {
-      const skill = await uploadSkillFile(filePath);
-      console.log('Skill uploaded successfully!');
-      console.log(`Name: ${skill?.name}`);
-      console.log(`Version: ${skill?.version || (skill?.versions?.[0]?.version)}`);
-      console.log(`Status: ${skill?.status || 'pending_review'}`);
-    } catch (err) {
-      if (err.message === 'NOT_LOGGED_IN') {
-        console.error('Not logged in. Run: skm login');
-      } else if (err.message === 'FILE_NOT_FOUND') {
-        console.error('File not found');
-      } else {
-        const msg = err.response?.data?.error || err.response?.data?.details?.[0] || err.message || 'Upload failed';
-        if (err.response?.status === 401) {
-          console.error('Token expired or invalid. Run: skm login');
-        } else {
-          console.error('Upload failed:', msg);
-        }
-      }
-      process.exit(1);
-    }
-  });
-
-export { pushCommand };
+import { Command } from 'commander';
+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';
+
+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('--dry-run', 'Validate without uploading')
+  .option('--api-url <url>', 'API base URL')
+  .action(async (options) => {
+    if (!getToken()) {
+      console.error('Not logged in. Run: skm login');
+      process.exit(1);
+    }
+
+    let filePath = options.file;
+    if (!filePath) {
+      filePath = await findUploadFile();
+      if (!filePath) {
+        console.error('No skill file found. Create SKILL.md or a .zip/.tar.gz package, or use --file <path>');
+        process.exit(1);
+      }
+    } else {
+      if (!await fs.pathExists(filePath)) {
+        console.error('File not found:', filePath);
+        process.exit(1);
+      }
+    }
+
+    if (options.dryRun) {
+      console.log('[DRY RUN] Would upload:', path.resolve(filePath));
+      return;
+    }
+
+    console.log(`Pushing skill from ${path.basename(filePath)}...`);
+    try {
+      const skill = await uploadSkillFile(filePath, { apiUrl: options.apiUrl });
+      console.log('Skill uploaded successfully!');
+      console.log(`Name: ${skill?.name}`);
+      console.log(`Version: ${skill?.version || (skill?.versions?.[0]?.version)}`);
+      console.log(`Status: ${skill?.status || 'pending_review'}`);
+    } catch (err) {
+      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>');
+      } 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' });
+      }
+    }
+  });
+
+export { pushCommand };

package/src/commands/search.js

@@ -1,61 +1,57 @@
-import { Command } from 'commander';
-import { createApiClient } from '../lib/auth.js';
-
-function formatSkillDisplay(skill) {
-  const author = skill.author?.username || skill.author?.fullName || '?';
-  const name = skill.name || '?';
-  const displayName = `@${author}/${name}`;
-  const version = skill.version || (skill.versions?.[0]?.version) || '—';
-  const downloads = skill.downloads ?? 0;
-  const category = skill.category || '—';
-  return { displayName, version, downloads, category };
-}
-
-const searchCommand = new Command('search');
-searchCommand
-  .description('Search skills from BotSkill')
-  .argument('<query>', 'Search query (name or description)')
-  .option('-c, --category <category>', 'Filter by category (ai, data, web, devops, security, tools)')
-  .option('-l, --limit <number>', 'Maximum number of results (default: 20)', '20')
-  .option('-p, --page <number>', 'Page number for pagination (default: 1)', '1')
-  .action(async (query, options) => {
-    const api = createApiClient();
-    const limit = parseInt(options.limit, 10) || 20;
-    const page = parseInt(options.page, 10) || 1;
-
-    try {
-      const params = { q: query, page, limit };
-      if (options.category) params.category = options.category;
-
-      const res = await api.get('/skills/search', { params });
-      const skills = res.data?.skills ?? res.data ?? [];
-      const pagination = res.data?.pagination ?? {};
-
-      if (skills.length === 0) {
-        console.log(`No skills found for "${query}".`);
-        return;
-      }
-
-      console.log(`\nFound ${pagination.totalSkills ?? skills.length} skill(s) for "${query}":`);
-      console.log('─'.repeat(60));
-      skills.forEach((skill) => {
-        const { displayName, version, downloads, category } = formatSkillDisplay(skill);
-        console.log(`  ${displayName}`);
-        console.log(`    Version: ${version} | Downloads: ${downloads} | Category: ${category}`);
-      });
-      if (pagination.totalPages > 1) {
-        console.log(`\nPage ${pagination.currentPage}/${pagination.totalPages}`);
-      }
-      console.log('\nUse "skm get @author/name" or "skm get @author/name@version" to download.');
-    } catch (err) {
-      let msg = err.message;
-      if (err.response?.data) {
-        const d = err.response.data;
-        msg = d.error || d.message || msg;
-      }
-      console.error('Error:', msg);
-      process.exit(1);
-    }
-  });
-
-export { searchCommand };
+import { Command } from 'commander';
+import { createApiClient } from '../lib/auth.js';
+import { printApiError } from '../lib/formatError.js';
+
+function formatSkillDisplay(skill) {
+  const author = skill.author?.username || skill.author?.fullName || '?';
+  const name = skill.name || '?';
+  const displayName = `@${author}/${name}`;
+  const version = skill.version || (skill.versions?.[0]?.version) || '—';
+  const downloads = skill.downloads ?? 0;
+  const category = skill.category || '—';
+  return { displayName, version, downloads, category };
+}
+
+const searchCommand = new Command('search');
+searchCommand
+  .description('Search skills from BotSkill')
+  .argument('<query>', 'Search query (name or description)')
+  .option('-c, --category <category>', 'Filter by category (ai, data, web, devops, security, tools)')
+  .option('-l, --limit <number>', 'Maximum number of results (default: 20)', '20')
+  .option('-p, --page <number>', 'Page number for pagination (default: 1)', '1')
+  .option('--api-url <url>', 'API base URL (overrides config for this command)')
+  .action(async (query, options) => {
+    const api = createApiClient(options.apiUrl);
+    const limit = parseInt(options.limit, 10) || 20;
+    const page = parseInt(options.page, 10) || 1;
+
+    try {
+      const params = { q: query, page, limit };
+      if (options.category) params.category = options.category;
+
+      const res = await api.get('/skills/search', { params });
+      const skills = res.data?.skills ?? res.data ?? [];
+      const pagination = res.data?.pagination ?? {};
+
+      if (skills.length === 0) {
+        console.log(`No skills found for "${query}".`);
+        return;
+      }
+
+      console.log(`\nFound ${pagination.totalSkills ?? skills.length} skill(s) for "${query}":`);
+      console.log('─'.repeat(60));
+      skills.forEach((skill) => {
+        const { displayName, version, downloads, category } = formatSkillDisplay(skill);
+        console.log(`  ${displayName}`);
+        console.log(`    Version: ${version} | Downloads: ${downloads} | Category: ${category}`);
+      });
+      if (pagination.totalPages > 1) {
+        console.log(`\nPage ${pagination.currentPage}/${pagination.totalPages}`);
+      }
+      console.log('\nUse "skm get @author/name" or "skm get @author/name@version" to download.');
+    } catch (err) {
+      printApiError(err, { prefix: 'Search failed' });
+    }
+  });
+
+export { searchCommand };

package/src/index.js

@@ -1,45 +1,45 @@
-#!/usr/bin/env node
-
-import { Command } from 'commander';
-import { readFileSync } from 'fs';
-import { fileURLToPath } from 'url';
-import { dirname, join } from 'path';
-import { initCommand } from './commands/init.js';
-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 { pushCommand } from './commands/push.js';
-import { publishCommand } from './commands/publish.js';
-import { listCommand } from './commands/list.js';
-import { searchCommand } from './commands/search.js';
-import { infoCommand } from './commands/info.js';
-import { helpCommand } from './commands/help.js';
-
-// 读取 package.json 中的版本号
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const packageJsonPath = join(__dirname, '../package.json');
-const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
-const version = packageJson.version || '0.0.0';
-
-const program = new Command();
-
-program
-  .name('skm')
-  .description('CLI tool for managing BotSkill - a platform for AI agent skills')
-  .version(version);
-
-program.addCommand(initCommand);
-program.addCommand(loginCommand);
-program.addCommand(logoutCommand);
-program.addCommand(configCommand);
-program.addCommand(getCommand);
-program.addCommand(pushCommand);
-program.addCommand(publishCommand);
-program.addCommand(listCommand);
-program.addCommand(searchCommand);
-program.addCommand(infoCommand);
-program.addCommand(helpCommand);
-
+#!/usr/bin/env node
+
+import { Command } from 'commander';
+import { readFileSync } from 'fs';
+import { fileURLToPath } from 'url';
+import { dirname, join } from 'path';
+import { initCommand } from './commands/init.js';
+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 { pushCommand } from './commands/push.js';
+import { publishCommand } from './commands/publish.js';
+import { listCommand } from './commands/list.js';
+import { searchCommand } from './commands/search.js';
+import { infoCommand } from './commands/info.js';
+import { helpCommand } from './commands/help.js';
+
+// 读取 package.json 中的版本号
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const packageJsonPath = join(__dirname, '../package.json');
+const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
+const version = packageJson.version || '0.0.0';
+
+const program = new Command();
+
+program
+  .name('skm')
+  .description('CLI tool for managing BotSkill - a platform for AI agent skills')
+  .version(version);
+
+program.addCommand(initCommand);
+program.addCommand(loginCommand);
+program.addCommand(logoutCommand);
+program.addCommand(configCommand);
+program.addCommand(getCommand);
+program.addCommand(pushCommand);
+program.addCommand(publishCommand);
+program.addCommand(listCommand);
+program.addCommand(searchCommand);
+program.addCommand(infoCommand);
+program.addCommand(helpCommand);
+
 program.parse();