@botskill/cli 1.0.3 → 1.0.4

package/src/commands/config.js

@@ -1,65 +1,65 @@
-import { Command } from 'commander';
-import { getApiUrl, setApiUrl, getToken, getUser, clearAuth, getConfigPath } from '../lib/auth.js';
-import { getDefaultApiUrl } from '../lib/constants.js';
-
-const configCommand = new Command('config');
-configCommand
-  .description('Manage CLI configuration')
-  .option('-g, --get <key>', 'Get configuration value')
-  .option('-s, --set <key=value>', 'Set configuration value')
-  .option('-l, --list', 'List all configurations')
-  .option('-p, --path', 'Show config file path')
-  .option('--reset', 'Reset configuration to defaults')
-  .action(async (options) => {
-    if (options.path) {
-      console.log(getConfigPath());
-      return;
-    }
-    if (options.list) {
-      const apiUrl = getApiUrl();
-      const token = getToken();
-      const user = getUser();
-      console.log('Current configuration:');
-      console.log(`  config: ${getConfigPath()}`);
-      console.log(`  apiUrl: ${apiUrl}`);
-      console.log(`  token: ${token ? '***' : '(not set)'}`);
-      if (user) {
-        console.log(`  user: ${user.username || user.email || user.id}`);
-      }
-    } else if (options.get) {
-      const key = options.get;
-      if (key === 'apiUrl') {
-        console.log(getApiUrl());
-      } else if (key === 'token') {
-        console.log(getToken() ? '***' : '(not set)');
-      } else {
-        console.error(`Unknown key: ${key}`);
-        process.exit(1);
-      }
-    } else if (options.set) {
-      const [key, value] = options.set.split('=');
-      if (!key || value === undefined) {
-        console.error('Use --set key=value');
-        process.exit(1);
-      }
-      if (key === 'apiUrl') {
-        setApiUrl(value.trim());
-        console.log(`apiUrl set to ${value}`);
-      } else {
-        console.error(`Unknown key: ${key}`);
-        process.exit(1);
-      }
-    } else if (options.reset) {
-      clearAuth();
-      setApiUrl(getDefaultApiUrl());
-      console.log('Configuration reset to defaults.');
-    } else {
-      console.log('Usage:');
-      console.log('  skm config --list          List configuration');
-      console.log('  skm config --get apiUrl    Get apiUrl');
-      console.log('  skm config --set apiUrl=URL  Set apiUrl');
-      console.log('  skm config --reset         Reset to defaults');
-    }
-  });
-
+import { Command } from 'commander';
+import { getApiUrl, setApiUrl, getToken, getUser, clearAuth, getConfigPath } from '../lib/auth.js';
+import { getDefaultApiUrl } from '../lib/constants.js';
+
+const configCommand = new Command('config');
+configCommand
+  .description('Manage CLI configuration')
+  .option('-g, --get <key>', 'Get configuration value')
+  .option('-s, --set <key=value>', 'Set configuration value')
+  .option('-l, --list', 'List all configurations')
+  .option('-p, --path', 'Show config file path')
+  .option('--reset', 'Reset configuration to defaults')
+  .action(async (options) => {
+    if (options.path) {
+      console.log(getConfigPath());
+      return;
+    }
+    if (options.list) {
+      const apiUrl = getApiUrl();
+      const token = getToken();
+      const user = getUser();
+      console.log('Current configuration:');
+      console.log(`  config: ${getConfigPath()}`);
+      console.log(`  apiUrl: ${apiUrl}`);
+      console.log(`  token: ${token ? '***' : '(not set)'}`);
+      if (user) {
+        console.log(`  user: ${user.username || user.email || user.id}`);
+      }
+    } else if (options.get) {
+      const key = options.get;
+      if (key === 'apiUrl') {
+        console.log(getApiUrl());
+      } else if (key === 'token') {
+        console.log(getToken() ? '***' : '(not set)');
+      } else {
+        console.error(`Unknown key: ${key}`);
+        process.exit(1);
+      }
+    } else if (options.set) {
+      const [key, value] = options.set.split('=');
+      if (!key || value === undefined) {
+        console.error('Use --set key=value');
+        process.exit(1);
+      }
+      if (key === 'apiUrl') {
+        setApiUrl(value.trim());
+        console.log(`apiUrl set to ${value}`);
+      } else {
+        console.error(`Unknown key: ${key}`);
+        process.exit(1);
+      }
+    } else if (options.reset) {
+      clearAuth();
+      setApiUrl(getDefaultApiUrl());
+      console.log('Configuration reset to defaults.');
+    } else {
+      console.log('Usage:');
+      console.log('  skm config --list          List configuration');
+      console.log('  skm config --get apiUrl    Get apiUrl');
+      console.log('  skm config --set apiUrl=URL  Set apiUrl');
+      console.log('  skm config --reset         Reset to defaults');
+    }
+  });
+
 export { configCommand };

package/src/commands/get.js

@@ -1,88 +1,82 @@
-import { Command } from 'commander';
-import path from 'path';
-import AdmZip from 'adm-zip';
-import { createApiClient } from '../lib/auth.js';
-
-/**
- * Parse specifier: name@version or name
- * Returns { name, version } for API
- */
-function parseSpecifier(spec) {
-  const s = spec.trim();
-  const atIdx = s.lastIndexOf('@');
-  if (atIdx < 0) return { name: s, version: undefined };
-  return {
-    name: s.slice(0, atIdx).trim(),
-    version: s.slice(atIdx + 1).trim() || undefined,
-  };
-}
-
-const getCommand = new Command('get');
-getCommand
-  .description('Download a skill from BotSkill and extract to directory')
-  .argument('<specifier>', 'Skill name or name@version (e.g. pdf-parser or pdf-parser@1.0.0)')
-  .option('-o, --output <dir>', 'Output directory (default: current directory)')
-  .option('--dry-run', 'Show what would be downloaded without actually downloading')
-  .action(async (specifier, options) => {
-    const { name, version } = parseSpecifier(specifier);
-    const outputDir = path.resolve(options.output || process.cwd());
-
-    if (!name) {
-      console.error('Error: skill name is required');
-      process.exit(1);
-    }
-
-    if (options.dryRun) {
-      console.log('[DRY RUN] Would download skill:', name);
-      console.log('[DRY RUN] Version:', version || 'latest');
-      console.log('[DRY RUN] Output:', outputDir);
-      return;
-    }
-
-    try {
-      const api = createApiClient();
-
-      const fullSpec = version ? `${name}@${version}` : name;
-      console.log(`Downloading skill: ${fullSpec}`);
-      console.log(`Version: ${version || 'latest'}`);
-      console.log(`Output: ${outputDir}`);
-
-      const resolveRes = await api.get(`/skills/by-name/${encodeURIComponent(fullSpec)}`);
-      const skill = resolveRes.data?.skill ?? resolveRes.data;
-      if (!skill?._id) {
-        console.error('Download failed: Skill not found');
-        process.exit(1);
-      }
-
-      const versionParam = version ? `?version=${encodeURIComponent(version)}` : '';
-      const url = `/skills/${encodeURIComponent(skill._id)}/download${versionParam}`;
-      const res = await api.get(url, { responseType: 'arraybuffer' });
-      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);
-
-      console.log(`\nSkill downloaded successfully!`);
-      console.log(`Location: ${targetPath}`);
-    } catch (err) {
-      let msg = err.message;
-      if (err.response?.data) {
-        const raw = err.response.data;
-        const str = Buffer.isBuffer(raw) ? raw.toString() : (typeof raw === 'string' ? raw : JSON.stringify(raw));
-        try {
-          const obj = JSON.parse(str);
-          msg = obj.error || obj.message || msg;
-        } catch (_) {
-          msg = str || msg;
-        }
-      }
-      console.error('Download failed:', msg);
-      process.exit(1);
-    }
-  });
-
-export { getCommand };
+import { Command } from 'commander';
+import path from 'path';
+import AdmZip from 'adm-zip';
+import { createApiClient } from '../lib/auth.js';
+import { printApiError } from '../lib/formatError.js';
+
+/**
+ * Parse specifier: name@version or name
+ * Returns { name, version } for API
+ */
+function parseSpecifier(spec) {
+  const s = spec.trim();
+  const atIdx = s.lastIndexOf('@');
+  if (atIdx < 0) return { name: s, version: undefined };
+  return {
+    name: s.slice(0, atIdx).trim(),
+    version: s.slice(atIdx + 1).trim() || undefined,
+  };
+}
+
+const getCommand = new Command('get');
+getCommand
+  .description('Download a skill from BotSkill and extract to directory')
+  .argument('<specifier>', 'Skill name or name@version (e.g. pdf-parser or pdf-parser@1.0.0)')
+  .option('-o, --output <dir>', 'Output directory (default: current directory)')
+  .option('--dry-run', 'Show what would be downloaded without actually downloading')
+  .option('--api-url <url>', 'API base URL (overrides config for this command)')
+  .action(async (specifier, options) => {
+    const { name, version } = parseSpecifier(specifier);
+    const outputDir = path.resolve(options.output || process.cwd());
+
+    if (!name) {
+      console.error('Error: skill name is required');
+      process.exit(1);
+    }
+
+    if (options.dryRun) {
+      console.log('[DRY RUN] Would download skill:', name);
+      console.log('[DRY RUN] Version:', version || 'latest');
+      console.log('[DRY RUN] Output:', outputDir);
+      return;
+    }
+
+    try {
+      const api = createApiClient(options.apiUrl);
+
+      const fullSpec = version ? `${name}@${version}` : name;
+      console.log(`Downloading skill: ${fullSpec}`);
+      console.log(`Version: ${version || 'latest'}`);
+      console.log(`Output: ${outputDir}`);
+
+      const resolveRes = await api.get(`/skills/by-name/${encodeURIComponent(fullSpec)}`);
+      const skill = resolveRes.data?.skill ?? resolveRes.data;
+      if (!skill?._id) {
+        console.error('Download failed: Skill not found');
+        process.exit(1);
+      }
+
+      const versionParam = version ? `?version=${encodeURIComponent(version)}` : '';
+      const url = `/skills/${encodeURIComponent(skill._id)}/download${versionParam}`;
+      const res = await api.get(url, { responseType: 'arraybuffer' });
+      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);
+
+      console.log(`\nSkill downloaded successfully!`);
+      console.log(`Location: ${targetPath}`);
+    } catch (err) {
+      if (err.response?.data && !Buffer.isBuffer(err.response.data)) {
+        const d = err.response.data;
+        err._overrideMsg = d.error || d.message;
+      }
+      printApiError(err, { prefix: 'Download failed' });
+    }
+  });
+
+export { getCommand };

package/src/commands/help.js

@@ -1,34 +1,25 @@
-import { Command } from 'commander';
-
-const helpCommand = new Command('help');
-helpCommand
-  .description('Show help information')
-  .action(async () => {
-    console.log('BotSkill Manager (skm) - CLI Tool');
-    console.log('');
-    console.log('Usage: skm [options] [command]');
-    console.log('');
-    console.log('Options:');
-    console.log('  -V, --version   output the version number');
-    console.log('  -h, --help      display help for command');
-    console.log('');
-    console.log('Commands:');
-    console.log('  init [options]     Initialize a new skill project');
-    console.log('  login [options]    Login to BotSkill platform');
-    console.log('  config [options]   Manage CLI configuration');
-    console.log('  get <skill-id>     Download a skill from BotSkill');
-    console.log('  push [options]     Upload/push a skill to BotSkill');
-    console.log('  list [options]     List skills from BotSkill');
-    console.log('  help [command]     display help for command');
-    console.log('');
-    console.log('Examples:');
-    console.log('  skm init --name my-skill');
-    console.log('  skm login --token abc123');
-    console.log('  skm list --category ai');
-    console.log('  skm get gpt-translator');
-    console.log('  skm push --public');
-    console.log('');
-    console.log('For detailed help on any command, use: skm [command] --help');
-  });
-
+import { Command } from 'commander';
+
+const helpCommand = new Command('help');
+helpCommand
+  .description('Show help for a command')
+  .argument('[command]', 'Command to show help for')
+  .action((cmdName, opts, command) => {
+    const program = command.parent;
+    if (cmdName) {
+      const sub = program.commands.find(
+        (c) => c.name() === cmdName || (c.aliases && c.aliases().includes(cmdName))
+      );
+      if (sub) {
+        sub.outputHelp();
+      } else {
+        console.error(`Unknown command: ${cmdName}`);
+        console.error(`Run "skm help" to see available commands.`);
+        process.exit(1);
+      }
+    } else {
+      program.outputHelp();
+    }
+  });
+
 export { helpCommand };

package/src/commands/info.js

@@ -1,79 +1,75 @@
-import { Command } from 'commander';
-import { createApiClient } from '../lib/auth.js';
-
-function parseSpecifier(spec) {
-  const s = spec.trim();
-  const atIdx = s.lastIndexOf('@');
-  if (atIdx < 0) return { name: s, version: undefined };
-  return {
-    name: s.slice(0, atIdx).trim(),
-    version: s.slice(atIdx + 1).trim() || undefined,
-  };
-}
-
-const infoCommand = new Command('info');
-infoCommand
-  .description('Show skill details from BotSkill')
-  .argument('<specifier>', 'Skill name or name@version')
-  .action(async (specifier) => {
-    const { name, version } = parseSpecifier(specifier);
-
-    if (!name) {
-      console.error('Error: skill name is required');
-      process.exit(1);
-    }
-
-    try {
-      const api = createApiClient();
-      const fullSpec = version ? `${name}@${version}` : name;
-
-      const resolveRes = await api.get(`/skills/by-name/${encodeURIComponent(fullSpec)}`);
-      const skill = resolveRes.data?.skill ?? resolveRes.data;
-      if (!skill?._id) {
-        console.error('Skill not found');
-        process.exit(1);
-      }
-
-      console.log('\n' + '─'.repeat(50));
-      console.log(`  ${skill.name}`);
-      console.log('─'.repeat(50));
-      console.log(`  Description: ${skill.description || '—'}`);
-      const author = skill.author?.username || skill.author?.fullName || '—';
-      console.log(`  Author:      ${author}`);
-      console.log(`  Category:    ${skill.category || '—'}`);
-      console.log(`  Downloads:   ${(skill.downloads ?? 0).toLocaleString()}`);
-      console.log(`  License:     ${skill.license || 'MIT'}`);
-      if (skill.tags?.length) {
-        console.log(`  Tags:        ${skill.tags.join(', ')}`);
-      }
-      if (skill.repositoryUrl) {
-        console.log(`  Repository:  ${skill.repositoryUrl}`);
-      }
-      if (skill.documentationUrl) {
-        console.log(`  Docs:        ${skill.documentationUrl}`);
-      }
-
-      const versions = skill.versions || [];
-      const versionList = versions.length > 0 ? versions : (skill.version ? [{ version: skill.version, description: skill.description }] : []);
-      if (versionList.length > 0) {
-        console.log('\n  Versions:');
-        versionList.forEach((v) => {
-          const date = v.createdAt ? new Date(v.createdAt).toLocaleDateString() : '';
-          console.log(`    - ${v.version}${date ? ` (${date})` : ''}`);
-        });
-      }
-
-      console.log('\n  Use "skm get name" or "skm get name@version" to download.');
-      console.log('');
-    } 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 { infoCommand };
+import { Command } from 'commander';
+import { createApiClient } from '../lib/auth.js';
+import { printApiError } from '../lib/formatError.js';
+
+function parseSpecifier(spec) {
+  const s = spec.trim();
+  const atIdx = s.lastIndexOf('@');
+  if (atIdx < 0) return { name: s, version: undefined };
+  return {
+    name: s.slice(0, atIdx).trim(),
+    version: s.slice(atIdx + 1).trim() || undefined,
+  };
+}
+
+const infoCommand = new Command('info');
+infoCommand
+  .description('Show skill details from BotSkill')
+  .argument('<specifier>', 'Skill name or name@version')
+  .option('--api-url <url>', 'API base URL (overrides config for this command)')
+  .action(async (specifier, options = {}) => {
+    const { name, version } = parseSpecifier(specifier);
+
+    if (!name) {
+      console.error('Error: skill name is required');
+      process.exit(1);
+    }
+
+    try {
+      const api = createApiClient(options.apiUrl);
+      const fullSpec = version ? `${name}@${version}` : name;
+
+      const resolveRes = await api.get(`/skills/by-name/${encodeURIComponent(fullSpec)}`);
+      const skill = resolveRes.data?.skill ?? resolveRes.data;
+      if (!skill?._id) {
+        console.error('Skill not found');
+        process.exit(1);
+      }
+
+      console.log('\n' + '─'.repeat(50));
+      console.log(`  ${skill.name}`);
+      console.log('─'.repeat(50));
+      console.log(`  Description: ${skill.description || '—'}`);
+      const author = skill.author?.username || skill.author?.fullName || '—';
+      console.log(`  Author:      ${author}`);
+      console.log(`  Category:    ${skill.category || '—'}`);
+      console.log(`  Downloads:   ${(skill.downloads ?? 0).toLocaleString()}`);
+      console.log(`  License:     ${skill.license || 'MIT'}`);
+      if (skill.tags?.length) {
+        console.log(`  Tags:        ${skill.tags.join(', ')}`);
+      }
+      if (skill.repositoryUrl) {
+        console.log(`  Repository:  ${skill.repositoryUrl}`);
+      }
+      if (skill.documentationUrl) {
+        console.log(`  Docs:        ${skill.documentationUrl}`);
+      }
+
+      const versions = skill.versions || [];
+      const versionList = versions.length > 0 ? versions : (skill.version ? [{ version: skill.version, description: skill.description }] : []);
+      if (versionList.length > 0) {
+        console.log('\n  Versions:');
+        versionList.forEach((v) => {
+          const date = v.createdAt ? new Date(v.createdAt).toLocaleDateString() : '';
+          console.log(`    - ${v.version}${date ? ` (${date})` : ''}`);
+        });
+      }
+
+      console.log('\n  Use "skm get name" or "skm get name@version" to download.');
+      console.log('');
+    } catch (err) {
+      printApiError(err, { prefix: 'Info failed' });
+    }
+  });
+
+export { infoCommand };