eskill 1.0.17 → 1.0.20

package/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
 import ora from 'ora';
-import { installFromGitUrl, listSkills, removeSkill } from './lib/installer.js';
+import { installFromGitUrl, listSkills, removeSkill, cleanupAllSkills, cleanupAll } from './lib/installer.js';
 import { AGENTS, getDefaultAgent } from './lib/agent-config.js';
 import { bashCompletionScript, zshCompletionScript, listSkillsForCompletion } from './lib/completion.js';
 import { searchSkills, formatSkillList } from './lib/search.js';
@@ -135,15 +135,36 @@ program
 
       console.log(formatSkillList(skills));
 
-      // 显示分页信息
-      if (total > 0) {
-        console.log(`总计: ${total} 个技能\n`);
-      }
+      // 显示分页信息和提示
+      if (total > 0 && skills.length > 0) {
+        const currentPage = pagination.page || parseInt(options.page);
+        const totalPages = pagination.totalPages || Math.ceil(total / skills.length);
+        const limit = pagination.limit || parseInt(options.limit);
+
+        // 分页信息
+        console.log(`┌─ 搜索结果 ──────────────────────────────────────────`);
+        console.log(`│  总计: ${total} 个技能  |  当前: 第 ${currentPage}/${totalPages} 页  |  每页: ${limit} 个`);
+        console.log(`└────────────────────────────────────────────────────\n`);
 
-      // 显示安装提示
-      if (skills.length > 0) {
-        console.log('💡 使用以下命令安装技能:');
-        console.log(`   eskill install <GitHub URL>\n`);
+        // 安装提示（使用第一个结果作为示例）
+        const firstSkill = skills[0];
+        const skillName = firstSkill.name || firstSkill.title || 'skill-name';
+        const author = firstSkill.author || firstSkill.owner || 'author';
+        console.log(`💡 安装技能:`);
+        console.log(`   eskill install ${skillName}@${author}\n`);
+
+        // 翻页提示
+        if (totalPages > 1) {
+          console.log(`📖 翻页:`);
+          if (currentPage < totalPages) {
+            console.log(`   eskill search ${query} --page ${currentPage + 1}`);
+            console.log(`   eskill search ${query} -p ${currentPage + 1}    # 简写`);
+          }
+          if (currentPage > 1) {
+            console.log(`   eskill search ${query} --page ${currentPage - 1}    # 上一页`);
+          }
+          console.log(``);
+        }
       }
     } catch (error) {
       spinner.fail(`搜索失败: ${error.message}`);
@@ -182,6 +203,39 @@ program
     }
   });
 
+// 清理命令
+program
+  .command('cleanup')
+  .description('清理 eskill 数据')
+  .option('-a, --all', '清理所有数据（包括配置和技能）', false)
+  .action(async (options) => {
+    try {
+      if (options.all) {
+        console.log('\n⚠️  警告：这将删除所有 eskill 数据（包括 API Key 配置和已安装的技能）');
+
+        const rl = readline.createInterface({
+          input: process.stdin,
+          output: process.stdout
+        });
+
+        rl.question('确认完全清理？: ', (answer) => {
+          rl.close();
+          if (answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
+            cleanupAll();
+          } else {
+            console.log('\n已取消清理\n');
+          }
+        });
+      } else {
+        console.log('\n清理所有已安装的技能（保留配置）...\n');
+        cleanupAllSkills();
+      }
+    } catch (error) {
+      console.error(`\n❌ 清理失败: ${error.message}\n`);
+      process.exit(1);
+    }
+  });
+
 // 列出支持的 agents
 program
   .command('agents')

package/lib/installer.js

@@ -1,6 +1,6 @@
 import { execSync } from 'child_process';
-import { existsSync, mkdirSync, symlinkSync, rmSync, readdirSync, writeFileSync, readFileSync } from 'fs';
-import { join, basename, dirname } from 'path';
+import { existsSync, mkdirSync, symlinkSync, rmSync, readdirSync, writeFileSync, readFileSync, copyFileSync } from 'fs';
+import { join, basename, dirname, homedir } from 'path';
 import { tmpdir } from 'os';
 import { fileURLToPath } from 'url';
 import { parseGitUrl } from './git-url-parser.js';
@@ -19,11 +19,63 @@ function getEskillPackageDir() {
 }
 
 /**
- * 获取技能存储目录
+ * 获取技能存储目录（用户主目录下，不受 npm 更新影响）
  */
 function getSkillsStorageDir() {
-  const pkgDir = getEskillPackageDir();
-  return join(pkgDir, 'skills-storage');
+  return join(homedir(), '.eskill', 'skills');
+}
+
+/**
+ * 迁移旧位置的技能到新位置
+ */
+function migrateOldSkills() {
+  const __filename = fileURLToPath(import.meta.url);
+  const __dirname = dirname(__filename);
+  const pkgDir = dirname(__dirname);
+  const oldDir = join(pkgDir, 'skills-storage');
+  const newDir = getSkillsStorageDir();
+
+  // 如果旧位置不存在，无需迁移
+  if (!existsSync(oldDir)) {
+    return;
+  }
+
+  // 如果新位置已存在，不重复迁移
+  if (existsSync(newDir)) {
+    return;
+  }
+
+  try {
+    // 创建新目录
+    mkdirSync(newDir, { recursive: true });
+
+    // 读取旧目录中的技能
+    const skills = readdirSync(oldDir, { withFileTypes: true })
+      .filter(dirent => dirent.isDirectory());
+
+    if (skills.length === 0) {
+      return;
+    }
+
+    console.log(`\n检测到旧位置的技能，正在迁移...`);
+
+    // 迁移每个技能
+    for (const skill of skills) {
+      const oldPath = join(oldDir, skill.name);
+      const newPath = join(newDir, skill.name);
+
+      // 递归复制目录
+      execSync(`cp -r "${oldPath}" "${newPath}"`, { stdio: 'inherit' });
+      console.log(`  ✓ 迁移: ${skill.name}`);
+    }
+
+    console.log(`\n技能迁移完成！\n`);
+    console.log(`旧位置: ${oldDir}`);
+    console.log(`新位置: ${newDir}`);
+    console.log(`\n提示: 可以删除旧位置以节省空间\n`);
+  } catch (error) {
+    console.log(`\n迁移失败: ${error.message}`);
+  }
 }
 
 /**
@@ -220,8 +272,8 @@ export async function installFromGitUrl(gitUrl, options = {}) {
     }
 
     console.log(`\n✓ 技能已安装到: ${targetPath}`);
-    console.log(`  存储位置: eskill 包目录`);
-    console.log(`  说明: 卸载 eskill 时会自动删除所有技能`);
+    console.log(`  存储位置: ~/.eskill/skills/`);
+    console.log(`  说明: 技能永久保存，更新 eskill 不会丢失`);
 
     // 保存技能元数据（作者、Git URL 等）
     saveSkillMeta(targetPath, {
@@ -248,6 +300,9 @@ export async function installFromGitUrl(gitUrl, options = {}) {
  * 列出已安装的技能
  */
 export function listSkills(agent = 'claude') {
+  // 自动迁移旧位置的技能
+  migrateOldSkills();
+
   const skillDir = getSkillsStorageDir();
 
   if (!existsSync(skillDir)) {
@@ -284,6 +339,46 @@ export function removeSkill(skillName, agent = 'claude') {
   console.log(`✓ 已删除技能: ${skillName}`);
 }
 
+/**
+ * 清理所有技能（用于卸载）
+ */
+export function cleanupAllSkills() {
+  const skillDir = getSkillsStorageDir();
+
+  if (!existsSync(skillDir)) {
+    console.log('没有需要清理的技能');
+    return;
+  }
+
+  try {
+    rmSync(skillDir, { recursive: true, force: true });
+    console.log(`✓ 已清理所有技能: ${skillDir}`);
+  } catch (error) {
+    console.error(`清理失败: ${error.message}`);
+    throw error;
+  }
+}
+
+/**
+ * 完全清理 eskill（包括配置和技能）
+ */
+export function cleanupAll() {
+  const eskillDir = join(homedir(), '.eskill');
+
+  if (!existsSync(eskillDir)) {
+    console.log('没有需要清理的数据');
+    return;
+  }
+
+  try {
+    rmSync(eskillDir, { recursive: true, force: true });
+    console.log(`✓ 已完全清理 eskill 数据: ${eskillDir}`);
+  } catch (error) {
+    console.error(`清理失败: ${error.message}`);
+    throw error;
+  }
+}
+
 /**
  * 获取技能存储目录路径
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eskill",
-  "version": "1.0.17",
+  "version": "1.0.20",
   "description": "Unified AI Agent Skills Management - Install skills from Git URLs",
   "main": "index.js",
   "type": "module",
@@ -9,6 +9,7 @@
   },
   "scripts": {
     "prepublishOnly": "node scripts/pre-publish-check.js",
+    "preuninstall": "node scripts/uninstall.js",
     "test": "node scripts/pre-publish-check.js",
     "security-check": "node scripts/pre-publish-check.js"
   },

package/scripts/uninstall.js

@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+/**
+ * eskill 卸载脚本
+ * 在 npm uninstall 时自动清理技能和配置
+ */
+import { existsSync } from 'fs';
+import { join } from 'path';
+import { homedir } from 'os';
+import { rmSync } from 'fs';
+
+const ESKILL_DIR = join(homedir(), '.eskill');
+
+if (existsSync(ESKILL_DIR)) {
+  try {
+    // 删除整个 .eskill 目录
+    rmSync(ESKILL_DIR, { recursive: true, force: true });
+    console.log('✓ eskill 数据已清理');
+  } catch (error) {
+    console.error(`清理失败: ${error.message}`);
+  }
+}