@botskill/cli 1.0.2 → 1.0.4

package/src/commands/init.js

@@ -1,128 +1,128 @@
-import { Command } from 'commander';
-import path from 'path';
-import fs from 'fs-extra';
-import inquirer from 'inquirer';
-
-const initCommand = new Command('init');
-initCommand
-  .description('Initialize a new skill project')
-  .option('-n, --name <name>', 'Project/skill name')
-  .option('-d, --description <description>', 'Skill description')
-  .option('-c, --category <category>', 'Category: ai, data, web, devops, security, tools')
-  .option('-y, --yes', 'Use defaults without prompting')
-  .action(async (options) => {
-    const cwd = process.cwd();
-    const configPath = path.join(cwd, 'skill.config.json');
-
-    if (await fs.pathExists(configPath)) {
-      console.error('skill.config.json already exists in this directory.');
-      process.exit(1);
-    }
-
-    const validCategories = ['ai', 'data', 'web', 'devops', 'security', 'tools'];
-    let answers = {};
-
-    if (options.yes) {
-      answers = {
-        name: options.name || 'my-skill',
-        description: options.description || 'A new AI skill',
-        category: options.category || 'tools',
-        version: '1.0.0',
-        license: 'MIT',
-      };
-    } else {
-      answers = await inquirer.prompt([
-        {
-          type: 'input',
-          name: 'name',
-          message: 'Skill name:',
-          default: options.name || 'my-skill',
-          validate: (v) => (v && v.length >= 2 ? true : 'Name must be at least 2 characters'),
-        },
-        {
-          type: 'input',
-          name: 'description',
-          message: 'Description:',
-          default: options.description || 'A new AI skill',
-          validate: (v) => (v ? true : 'Description is required'),
-        },
-        {
-          type: 'list',
-          name: 'category',
-          message: 'Category:',
-          choices: validCategories,
-          default: options.category && validCategories.includes(options.category) ? options.category : 'tools',
-        },
-        {
-          type: 'input',
-          name: 'version',
-          message: 'Version:',
-          default: '1.0.0',
-        },
-        {
-          type: 'input',
-          name: 'license',
-          message: 'License:',
-          default: 'MIT',
-        },
-      ]);
-    }
-
-    const config = {
-      name: answers.name,
-      description: answers.description,
-      version: answers.version,
-      category: answers.category,
-      license: answers.license,
-      tags: [],
-      repositoryUrl: '',
-      documentationUrl: '',
-      demoUrl: '',
-    };
-
-    await fs.writeJson(configPath, config, { spaces: 2 });
-
-    // Agent Skills spec: https://agentskills.io/specification
-    // name: required, 1-64 chars, lowercase + hyphens
-    // description: required, max 1024 chars
-    // metadata.version, metadata.author: optional
-    const rawName = String(answers.name || 'my-skill').trim();
-    const skillName = rawName.toLowerCase().replace(/\s+/g, '-').replace(/[^a-z0-9-]/g, '').replace(/-+/g, '-').replace(/^-|-$/g, '') || 'my-skill';
-    const skillMd = `---
-name: ${skillName}
-description: ${answers.description}
-license: ${answers.license}
-metadata:
-  author: ${skillName}
-  version: "${answers.version}"
-# Platform-specific (optional)
-category: ${answers.category}
-tags: []
----
-
-# ${answers.name}
-
-${answers.description}
-
-## Usage
-
-Add your usage documentation here. The Markdown body contains skill instructions for agents.
-
-## Installation
-
-\`\`\`bash
-# Add installation instructions
-\`\`\`
-`;
-
-    const skillMdPath = path.join(cwd, 'SKILL.md');
-    await fs.writeFile(skillMdPath, skillMd, 'utf-8');
-
-    console.log('Created skill.config.json and SKILL.md');
-    console.log('\nNext steps:');
-    console.log('1. Edit SKILL.md to add documentation (the content below the frontmatter)');
-    console.log('2. Run "skm login" to authenticate');
-    console.log('3. Run "skm push" or "skm publish" to upload your skill');
-  });
-
-export { initCommand };
+import { Command } from 'commander';
+import path from 'path';
+import fs from 'fs-extra';
+import inquirer from 'inquirer';
+
+const initCommand = new Command('init');
+initCommand
+  .description('Initialize a new skill project')
+  .option('-n, --name <name>', 'Project/skill name')
+  .option('-d, --description <description>', 'Skill description')
+  .option('-c, --category <category>', 'Category: ai, data, web, devops, security, tools')
+  .option('-y, --yes', 'Use defaults without prompting')
+  .action(async (options) => {
+    const cwd = process.cwd();
+    const configPath = path.join(cwd, 'skill.config.json');
+
+    if (await fs.pathExists(configPath)) {
+      console.error('skill.config.json already exists in this directory.');
+      process.exit(1);
+    }
+
+    const validCategories = ['ai', 'data', 'web', 'devops', 'security', 'tools'];
+    let answers = {};
+
+    if (options.yes) {
+      answers = {
+        name: options.name || 'my-skill',
+        description: options.description || 'A new AI skill',
+        category: options.category || 'tools',
+        version: '1.0.0',
+        license: 'MIT',
+      };
+    } else {
+      answers = await inquirer.prompt([
+        {
+          type: 'input',
+          name: 'name',
+          message: 'Skill name:',
+          default: options.name || 'my-skill',
+          validate: (v) => (v && v.length >= 2 ? true : 'Name must be at least 2 characters'),
+        },
+        {
+          type: 'input',
+          name: 'description',
+          message: 'Description:',
+          default: options.description || 'A new AI skill',
+          validate: (v) => (v ? true : 'Description is required'),
+        },
+        {
+          type: 'list',
+          name: 'category',
+          message: 'Category:',
+          choices: validCategories,
+          default: options.category && validCategories.includes(options.category) ? options.category : 'tools',
+        },
+        {
+          type: 'input',
+          name: 'version',
+          message: 'Version:',
+          default: '1.0.0',
+        },
+        {
+          type: 'input',
+          name: 'license',
+          message: 'License:',
+          default: 'MIT',
+        },
+      ]);
+    }
+
+    const config = {
+      name: answers.name,
+      description: answers.description,
+      version: answers.version,
+      category: answers.category,
+      license: answers.license,
+      tags: [],
+      repositoryUrl: '',
+      documentationUrl: '',
+      demoUrl: '',
+    };
+
+    await fs.writeJson(configPath, config, { spaces: 2 });
+
+    // Agent Skills spec: https://agentskills.io/specification
+    // name: required, 1-64 chars, lowercase + hyphens
+    // description: required, max 1024 chars
+    // metadata.version, metadata.author: optional
+    const rawName = String(answers.name || 'my-skill').trim();
+    const skillName = rawName.toLowerCase().replace(/\s+/g, '-').replace(/[^a-z0-9-]/g, '').replace(/-+/g, '-').replace(/^-|-$/g, '') || 'my-skill';
+    const skillMd = `---
+name: ${skillName}
+description: ${answers.description}
+license: ${answers.license}
+metadata:
+  author: ${skillName}
+  version: "${answers.version}"
+# Platform-specific (optional)
+category: ${answers.category}
+tags: []
+---
+
+# ${answers.name}
+
+${answers.description}
+
+## Usage
+
+Add your usage documentation here. The Markdown body contains skill instructions for agents.
+
+## Installation
+
+\`\`\`bash
+# Add installation instructions
+\`\`\`
+`;
+
+    const skillMdPath = path.join(cwd, 'SKILL.md');
+    await fs.writeFile(skillMdPath, skillMd, 'utf-8');
+
+    console.log('Created skill.config.json and SKILL.md');
+    console.log('\nNext steps:');
+    console.log('1. Edit SKILL.md to add documentation (the content below the frontmatter)');
+    console.log('2. Run "skm login" to authenticate');
+    console.log('3. Run "skm push" or "skm publish" to upload your skill');
+  });
+
+export { initCommand };

package/src/commands/list.js

@@ -1,84 +1,79 @@
-import { Command } from 'commander';
-import { createApiClient } from '../lib/auth.js';
-import { isLoggedIn } from '../lib/auth.js';
-
-function formatSkillDisplay(skill) {
-  const name = skill.name || '?';
-  const version = skill.version || (skill.versions?.[0]?.version) || '—';
-  const downloads = skill.downloads ?? 0;
-  const category = skill.category || '—';
-  const status = skill.status || '—';
-  return { name, version, downloads, category, status };
-}
-
-const listCommand = new Command('list');
-listCommand
-  .alias('ls')
-  .description('List skills from BotSkill')
-  .option('-c, --category <category>', 'Filter by category (ai, data, web, devops, security, tools)')
-  .option('-s, --search <query>', 'Search skills by name or description')
-  .option('-m, --mine', 'Show only your skills (requires login)')
-  .option('-l, --limit <number>', 'Maximum number of results (default: 20)', '20')
-  .option('-p, --page <number>', 'Page number for pagination (default: 1)', '1')
-  .action(async (options) => {
-    const api = createApiClient();
-    const limit = parseInt(options.limit, 10) || 20;
-    const page = parseInt(options.page, 10) || 1;
-
-    try {
-      let res;
-      if (options.mine) {
-        if (!isLoggedIn()) {
-          console.error('Error: --mine requires login. Run "skm login" first.');
-          process.exit(1);
-        }
-        const params = { page, limit };
-        if (options.category) params.category = options.category;
-        if (options.search) params.q = options.search;
-        res = await api.get('/skills/my', { params });
-      } else {
-        const params = { page, limit };
-        if (options.category) params.category = options.category;
-        if (options.search) params.q = options.search;
-        if (params.q || params.category) {
-          res = await api.get('/skills/search', { params });
-        } else {
-          res = await api.get('/skills', { params });
-        }
-      }
-
-      const skills = res.data?.skills ?? res.data ?? [];
-      const pagination = res.data?.pagination ?? {};
-
-      if (skills.length === 0) {
-        console.log('No skills found.');
-        return;
-      }
-
-      console.log(`\nFound ${pagination.totalSkills ?? skills.length} skill(s):`);
-      console.log('─'.repeat(60));
-      skills.forEach((skill) => {
-        const { name, version, downloads, category, status } = formatSkillDisplay(skill);
-        const statusStr = options.mine ? ` | ${status}` : '';
-        console.log(`  ${name}`);
-        console.log(`    Version: ${version} | Downloads: ${downloads} | Category: ${category}${statusStr}`);
-      });
-      if (pagination.totalPages > 1) {
-        console.log(`\nPage ${pagination.currentPage}/${pagination.totalPages}`);
-      }
-      console.log('\nUse "skm get name" or "skm get 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;
-      }
-      if (err.response?.status === 401 && options.mine) {
-        msg = 'Login required. Run "skm login" first.';
-      }
-      console.error('Error:', msg);
-      process.exit(1);
-    }
-  });
-
-export { listCommand };
+import { Command } from 'commander';
+import { createApiClient, isLoggedIn } from '../lib/auth.js';
+import { printApiError } from '../lib/formatError.js';
+
+function formatSkillDisplay(skill) {
+  const name = skill.name || '?';
+  const version = skill.version || (skill.versions?.[0]?.version) || '—';
+  const downloads = skill.downloads ?? 0;
+  const category = skill.category || '—';
+  const status = skill.status || '—';
+  return { name, version, downloads, category, status };
+}
+
+const listCommand = new Command('list');
+listCommand
+  .alias('ls')
+  .description('List skills from BotSkill')
+  .option('-c, --category <category>', 'Filter by category (ai, data, web, devops, security, tools)')
+  .option('-s, --search <query>', 'Search skills by name or description')
+  .option('-m, --mine', 'Show only your skills (requires login)')
+  .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 (options) => {
+    const api = createApiClient(options.apiUrl);
+    const limit = parseInt(options.limit, 10) || 20;
+    const page = parseInt(options.page, 10) || 1;
+
+    try {
+      let res;
+      if (options.mine) {
+        if (!isLoggedIn()) {
+          console.error('Error: --mine requires login. Run "skm login" first.');
+          process.exit(1);
+        }
+        const params = { page, limit };
+        if (options.category) params.category = options.category;
+        if (options.search) params.q = options.search;
+        res = await api.get('/skills/my', { params });
+      } else {
+        const params = { page, limit };
+        if (options.category) params.category = options.category;
+        if (options.search) params.q = options.search;
+        if (params.q || params.category) {
+          res = await api.get('/skills/search', { params });
+        } else {
+          res = await api.get('/skills', { params });
+        }
+      }
+
+      const skills = res.data?.skills ?? res.data ?? [];
+      const pagination = res.data?.pagination ?? {};
+
+      if (skills.length === 0) {
+        console.log('No skills found.');
+        return;
+      }
+
+      console.log(`\nFound ${pagination.totalSkills ?? skills.length} skill(s):`);
+      console.log('─'.repeat(60));
+      skills.forEach((skill) => {
+        const { name, version, downloads, category, status } = formatSkillDisplay(skill);
+        const statusStr = options.mine ? ` | ${status}` : '';
+        console.log(`  ${name}`);
+        console.log(`    Version: ${version} | Downloads: ${downloads} | Category: ${category}${statusStr}`);
+      });
+      if (pagination.totalPages > 1) {
+        console.log(`\nPage ${pagination.currentPage}/${pagination.totalPages}`);
+      }
+      console.log('\nUse "skm get name" or "skm get name@version" to download.');
+    } catch (err) {
+      if (err.response?.status === 401 && options.mine) {
+        err._overrideMsg = 'Login required. Run "skm login" first.';
+      }
+      printApiError(err, { prefix: 'List failed' });
+    }
+  });
+
+export { listCommand };

package/src/commands/login.js

@@ -1,75 +1,73 @@
-import { Command } from 'commander';
-import inquirer from 'inquirer';
-import axios from 'axios';
-import { getApiUrl, setAuth, setApiUrl } from '../lib/auth.js';
-
-const loginCommand = new Command('login');
-loginCommand
-  .description('Login to BotSkill platform')
-  .option('-u, --username <username>', 'Username')
-  .option('-e, --email <email>', 'Email address')
-  .option('-p, --password <password>', 'Password')
-  .option('-t, --token <token>', 'Use access token directly (from web)')
-  .option('--api-url <url>', 'API base URL')
-  .action(async (options) => {
-    const apiUrl = options.apiUrl || getApiUrl();
-    if (options.apiUrl) {
-      setApiUrl(options.apiUrl);
-    }
-
-    if (options.token) {
-      setAuth({ token: options.token });
-      console.log('Token saved. Logged in successfully.');
-      return;
-    }
-
-    let emailOrUsername = options.email || options.username;
-    let password = options.password;
-
-    if (!emailOrUsername || !password) {
-      const answers = await inquirer.prompt([
-        {
-          type: 'input',
-          name: 'emailOrUsername',
-          message: 'Email or Username:',
-          default: emailOrUsername,
-          validate: (v) => (v?.trim() ? true : 'Required'),
-        },
-        {
-          type: 'password',
-          name: 'password',
-          message: 'Password:',
-          mask: '*',
-          validate: (v) => (v ? true : 'Required'),
-        },
-      ]);
-      emailOrUsername = answers.emailOrUsername?.trim();
-      password = answers.password;
-    }
-
-    console.log('Logging in to BotSkill...');
-    try {
-      const res = await axios.post(`${apiUrl}/auth/login`, {
-        email: emailOrUsername,
-        password,
-      });
-      const data = res.data?.data || res.data;
-      const accessToken = data.accessToken || data.token;
-      const refreshToken = data.refreshToken;
-      const user = data.user;
-
-      if (!accessToken) {
-        console.error('Login failed: No token received');
-        process.exit(1);
-      }
-
-      setAuth({ token: accessToken, refreshToken, user });
-      console.log(`Logged in as ${user?.username || user?.email || 'user'}`);
-    } catch (err) {
-      const msg = err.response?.data?.error || err.message || 'Login failed';
-      console.error('Login failed:', msg);
-      process.exit(1);
-    }
-  });
-
-export { loginCommand };
+import { Command } from 'commander';
+import inquirer from 'inquirer';
+import axios from 'axios';
+import { getApiUrl, setAuth, normalizeApiUrl } from '../lib/auth.js';
+import { printApiError } from '../lib/formatError.js';
+
+const loginCommand = new Command('login');
+loginCommand
+  .description('Login to BotSkill platform')
+  .option('-u, --username <username>', 'Username')
+  .option('-e, --email <email>', 'Email address')
+  .option('-p, --password <password>', 'Password')
+  .option('-t, --token <token>', 'Use access token directly (from web)')
+  .option('--api-url <url>', 'API base URL (overrides config for this command)')
+  .action(async (options) => {
+    const apiUrl = normalizeApiUrl(options.apiUrl || getApiUrl());
+
+    if (options.token) {
+      setAuth({ token: options.token });
+      console.log('Token saved. Logged in successfully.');
+      return;
+    }
+
+    let emailOrUsername = options.email || options.username;
+    let password = options.password;
+
+    if (!emailOrUsername || !password) {
+      const answers = await inquirer.prompt([
+        {
+          type: 'input',
+          name: 'emailOrUsername',
+          message: 'Email or Username:',
+          default: emailOrUsername,
+          validate: (v) => (v?.trim() ? true : 'Required'),
+        },
+        {
+          type: 'password',
+          name: 'password',
+          message: 'Password:',
+          mask: '*',
+          validate: (v) => (v ? true : 'Required'),
+        },
+      ]);
+      emailOrUsername = answers.emailOrUsername?.trim();
+      password = answers.password;
+    }
+
+    console.log('Logging in to BotSkill...');
+    try {
+      const res = await axios.post(`${apiUrl}/auth/login`, {
+        email: emailOrUsername,
+        password,
+      });
+      const data = res.data?.data || res.data;
+      const accessToken = data.accessToken || data.token;
+      const refreshToken = data.refreshToken;
+      const user = data.user;
+
+      if (!accessToken) {
+        console.error('Login failed: No token received');
+        process.exit(1);
+      }
+
+      setAuth({ token: accessToken, refreshToken, user });
+      console.log(`Logged in as ${user?.username || user?.email || 'user'}`);
+    } catch (err) {
+      const msg = err.response?.data?.error || err.message;
+      if (msg) err._overrideMsg = msg;
+      printApiError(err, { prefix: 'Login failed' });
+    }
+  });
+
+export { loginCommand };

package/src/commands/logout.js

@@ -1,19 +1,21 @@
-import { Command } from 'commander';
-import { clearAuth, getApiUrl, getRefreshToken } from '../lib/auth.js';
-import axios from 'axios';
-
-const logoutCommand = new Command('logout');
-logoutCommand
-  .description('Logout from BotSkill')
-  .action(async () => {
-    const refreshToken = getRefreshToken();
-    if (refreshToken) {
-      try {
-        await axios.post(`${getApiUrl()}/auth/logout`, { refreshToken });
-      } catch (_) {}
-    }
-    clearAuth();
-    console.log('Logged out successfully.');
-  });
-
-export { logoutCommand };
+import { Command } from 'commander';
+import { clearAuth, getApiUrl, getRefreshToken, normalizeApiUrl } from '../lib/auth.js';
+import axios from 'axios';
+
+const logoutCommand = new Command('logout');
+logoutCommand
+  .description('Logout from BotSkill')
+  .option('--api-url <url>', 'API base URL (overrides config for this command)')
+  .action(async (options) => {
+    const apiUrl = normalizeApiUrl(options.apiUrl || getApiUrl());
+    const refreshToken = getRefreshToken();
+    if (refreshToken) {
+      try {
+        await axios.post(`${apiUrl}/auth/logout`, { refreshToken });
+      } catch (_) {}
+    }
+    clearAuth();
+    console.log('Logged out successfully.');
+  });
+
+export { logoutCommand };