itismyskillmarket 1.3.0 → 1.3.2

package/src/commands/install.ts

@@ -3,7 +3,7 @@
  * SkillMarket 安装命令模块
  * =============================================================================
  * 
- * 本模块实现 `skm install` 命令，用于安装 skill 到本地。
+ * 本模块实现 `skm install` 命令，用于安装 skill 到本地和跨平台目录。
  * 
  * 安装流程:
  * 1. 确保目录结构存在
@@ -11,7 +11,8 @@
  * 3. 下载包到缓存
  * 4. 解压并复制到 skills 目录
  * 5. 创建 latest 软链接
- * 6. 更新本地注册表
+ * 6. 安装到目标平台（OpenCode/Claude Code/VSCode）
+ * 7. 更新本地注册表
  * 
  * 安装后的目录结构:
  * ~/.skillmarket/
@@ -23,6 +24,11 @@
  * │           └── metadata.json
  * └── ...
  * 
+ * 跨平台安装:
+ * - OpenCode: ~/.config/opencode/skills/<skillId>/SKILL.md
+ * - Claude Code: ~/.claude/skills/<skillId>/SKILL.md
+ * - VSCode: ~/.copilot/skills/<skillId>/SKILL.md
+ * 
  * @module commands/install
  */
 
@@ -36,17 +42,29 @@ import { exec } from 'child_process'; // 执行 shell 命令
 import { promisify } from 'util';    // Promise 化工具
 
 // 模块导入
-import { fetchNpmPackage } from './npm.js';         // npm 查询
+import { fetchSkillPackage } from './npm.js';         // npm 查询
 import { loadRegistry, saveRegistry } from './registry.js';  // 注册表操作
 import { getCacheDir, getSkillsDir, ensureMarketDirs } from '../utils/dirs.js';  // 目录工具
-import { detectPlatform, getPlatformFromInput, isValidPlatform, type Platform } from '../utils/platform.js';  // 平台检测
-import { syncPlatformLinks } from './sync.js';  // 同步命令
-import { LATEST_LINK, PLATFORMS } from '../constants.js';       // 常量
+import { detectPlatforms, getAdapterByPlatform } from '../adapters/index.js';  // 平台适配器
+import { LATEST_LINK } from '../constants.js';       // 常量
 import type { InstalledSkill } from '../types.js';    // 类型定义
+import type { Platform } from '../constants.js';
+import type { PlatformAdapter } from '../types.js';
 
 // 将 exec 转为 Promise 形式
 const execAsync = promisify(exec);
 
+// -----------------------------------------------------------------------------
+// 安装选项接口
+// -----------------------------------------------------------------------------
+
+export interface InstallOptions {
+  /** 目标平台列表（留空则安装到所有可用平台） */
+  platforms?: string[];
+  /** 强制覆盖已安装的 skill */
+  force?: boolean;
+}
+
 // -----------------------------------------------------------------------------
 // 安装函数
 // -----------------------------------------------------------------------------
@@ -56,7 +74,7 @@ const execAsync = promisify(exec);
  * 
  * @param {string} skillId - Skill 标识符（支持短格式或 scoped 格式）
  * @param {string} [version] - 指定版本号（可选，不指定则安装最新版本）
- * @param {string} [targetPlatform] - 目标平台（可选，不指定则使用当前检测到的平台）
+ * @param {InstallOptions} [options] - 安装选项
  * @returns {Promise<void>}
  * 
  * @example
@@ -66,44 +84,39 @@ const execAsync = promisify(exec);
  * // 安装指定版本
  * await installSkill('brainstorming', '1.0.0');
  * 
- * // 安装到指定平台
- * await installSkill('brainstorming', undefined, 'opencode');
+ * // 安装到特定平台
+ * await installSkill('brainstorming', undefined, { platforms: ['opencode'] });
  * 
- * // 安装 scoped 包
- * await installSkill('@custom/skill');
+ * // 强制覆盖
+ * await installSkill('brainstorming', undefined, { force: true });
  */
 export async function installSkill(
   skillId: string, 
   version?: string,
-  targetPlatform?: string
+  options?: InstallOptions
 ): Promise<void> {
   // ==========================================================================
   // 步骤 0: 准备
   // ==========================================================================
   
-// 确保所有必要的目录都已创建
+  // 确保所有必要的目录都已创建
   await ensureMarketDirs();
-
-  // 转换包名格式
-  // 用户可以直接指定 @scope/package 或不带前缀的 short name
-  // short name 会被添加 @skillmarket/ 前缀尝试
-  // 如果是 scoped 包 (@scope/name)，直接使用
-  const isScoped = skillId.startsWith('@');
-  const packageName = isScoped ? skillId : `@skillmarket/${skillId}`;
-  const shortName = skillId; // 用于本地目录名
   
-  console.log(`Installing ${packageName}${version ? `@${version}` : ''}...`);
+  console.log(`Installing ${skillId}${version ? `@${version}` : ''}...`);
   
   // ==========================================================================
   // 步骤 1: 获取包信息
   // ==========================================================================
   
-  // 从 npm 查询包的元信息
-  const pkgInfo = await fetchNpmPackage(packageName);
+  // 从 npm 查询包的元信息（自动尝试多个可能的 scope）
+  const pkgInfo = await fetchSkillPackage(skillId);
   if (!pkgInfo) {
-    throw new Error(`Package ${packageName} not found`);
+    throw new Error(`Package ${skillId} not found`);
   }
   
+  // 获取实际找到的包名
+  const packageName = pkgInfo.name;
+  
   // 确定要安装的版本（用户指定版本 > 最新版本）
   const targetVersion = version || pkgInfo['dist-tags']?.latest;
   if (!targetVersion) {
@@ -134,10 +147,10 @@ export async function installSkill(
       const files = await fs.readdir(cacheDir);
       
       // npm pack 生成的文件名格式: <package-name>-<version>.tgz
-      // scoped 包格式: @scope-package-name-<version>.tgz
+      // scoped 包格式: @scope-package-name-<version>.tgz (注意：@ 不在文件名中)
       const tarball = files.find(f => 
         f.endsWith('.tgz') && 
-        f.includes(packageName.replace('/', '-'))
+        f.includes(packageName.replace(/^@/, '').replace('/', '-'))
       );
       
       if (tarball) {
@@ -214,56 +227,82 @@ export async function installSkill(
   }
   
   // ==========================================================================
-  // 步骤 5: 确定目标平台
+  // 步骤 5: 安装到目标平台 (NEW)
   // ==========================================================================
   
-  // 确定实际使用的平台
-  let finalPlatform: Platform;
-  
-  if (targetPlatform) {
-    // 验证用户指定的目标平台
-    const parsed = getPlatformFromInput(targetPlatform);
-    if (!parsed) {
-      throw new Error(`Invalid platform: ${targetPlatform}. Valid platforms: ${PLATFORMS.join(', ')}`);
+  let targetAdapters: PlatformAdapter[] = [];
+  
+  if (options?.platforms && options.platforms.length > 0) {
+    // 用户指定了平台
+    for (const platformStr of options.platforms) {
+      const platform = platformStr as Platform;
+      const adapter = getAdapterByPlatform(platform);
+      if (adapter) {
+        targetAdapters.push(adapter);
+      } else {
+        console.warn(`⚠️  Unknown platform: ${platformStr}`);
+      }
     }
-    finalPlatform = parsed;
   } else {
-    // 使用当前检测到的平台
-    finalPlatform = detectPlatform();
+    // 自动检测可用平台
+    targetAdapters = await detectPlatforms();
   }
   
-  console.log(`Target platform: ${finalPlatform}`);
+  if (targetAdapters.length === 0) {
+    console.log('No target platforms detected.');
+    console.log('Use --platform to specify platforms manually.');
+  } else {
+    console.log(`\nInstalling to ${targetAdapters.length} platform(s)...\n`);
+    
+    // 安装到每个平台
+    const results: { name: string; status: 'installed' | 'skipped' | 'failed'; error?: string }[] = [];
+    
+    for (const adapter of targetAdapters) {
+      try {
+        const isInstalled = await adapter.isInstalled(skillId);
+        
+        if (isInstalled && !options?.force) {
+          console.log(`${adapter.name.padEnd(12)} ⚠️  Already installed (use --force to overwrite)`);
+          results.push({ name: adapter.name, status: 'skipped' });
+          continue;
+        }
+        
+        // 安装 skill 到平台目录
+        await adapter.install(skillId, skillVersionDir);
+        console.log(`${adapter.name.padEnd(12)} ✅  Installed successfully`);
+        results.push({ name: adapter.name, status: 'installed' });
+      } catch (error) {
+        console.log(`${adapter.name.padEnd(12)} ❌  Failed: ${error}`);
+        results.push({ name: adapter.name, status: 'failed', error: String(error) });
+      }
+    }
+    
+    // 显示摘要
+    const installed = results.filter(r => r.status === 'installed').length;
+    const skipped = results.filter(r => r.status === 'skipped').length;
+    const failed = results.filter(r => r.status === 'failed').length;
+    
+    console.log(`\n📊 Summary: ${installed} installed, ${skipped} skipped, ${failed} failed`);
+  }
   
   // ==========================================================================
   // 步骤 6: 更新注册表
   // ==========================================================================
   
   const registry = await loadRegistry();
-  
-  // 获取现有平台列表（如果 skill 已安装）
-  const existingSkill = registry.skills[skillId];
-  const existingPlatforms = existingSkill?.platforms || [];
+  const installedPlatforms = targetAdapters.map(a => a.id);
   
   // 添加/更新注册表中的 skill 记录
   registry.skills[skillId] = {
     id: skillId,
     version: targetVersion,
     installedAt: new Date().toISOString(),
-    platforms: existingPlatforms.includes(finalPlatform as string) 
-      ? existingPlatforms 
-      : [...existingPlatforms, finalPlatform as string]
+    platforms: installedPlatforms
   } as InstalledSkill;
   
   // 保存注册表
   await saveRegistry(registry);
   
-  // ==========================================================================
-  // 步骤 7: 同步到指定平台
-  // ==========================================================================
-  
-  console.log(`Syncing to ${finalPlatform}...`);
-  await syncPlatformLinks(finalPlatform);
-  
   // ==========================================================================
   // 完成
   // ==========================================================================

package/src/commands/ls.ts

@@ -37,6 +37,15 @@ interface LsOptions {
   
   /** 检查更新（预留功能） */
   updates?: boolean;
+  
+  /** 页码（从 1 开始） */
+  page?: number;
+  
+  /** 每页数量 */
+  limit?: number;
+  
+  /** 搜索关键字（支持 id, displayName, description） */
+  search?: string;
 }
 
 // -----------------------------------------------------------------------------
@@ -59,26 +68,127 @@ interface LsOptions {
  * // 列出已安装的 skills
  * await listSkills({ installed: true });
  */
+// -----------------------------------------------------------------------------
+// 搜索过滤函数
+// -----------------------------------------------------------------------------
+
+/**
+ * 过滤已安装的 skills（按关键字）
+ * 
+ * 匹配 id, displayName, description 字段
+ * 
+ * @param skills - 已安装的 skills 列表
+ * @param keyword - 搜索关键字
+ * @returns 过滤后的 skills 列表
+ */
+function filterInstalledSkills(skills: any[], keyword: string): any[] {
+  const lower = keyword.toLowerCase();
+  return skills.filter(s => 
+    s.id.toLowerCase().includes(lower) ||
+    (s.displayName && s.displayName.toLowerCase().includes(lower)) ||
+    (s.description && s.description.toLowerCase().includes(lower))
+  );
+}
+
+// -----------------------------------------------------------------------------
+// 命令实现
+// -----------------------------------------------------------------------------
+
+/**
+ * 独立搜索 skills（不依赖 ls 命令选项）
+ * 
+ * @param keyword - 搜索关键字
+ * @param limit - 返回结果数量限制
+ * @returns 搜索结果列表
+ */
+export async function searchSkills(keyword: string, limit: number = 20): Promise<void> {
+  console.log(`Searching npm for "${keyword}"...\n`);
+  
+  try {
+    const { packages, total } = await searchSkillmarketPackages({
+      from: 0,
+      size: limit,
+      keyword
+    });
+    
+    if (packages.length === 0) {
+      console.log(`No skills found matching "${keyword}".`);
+      return;
+    }
+    
+    console.log(`Found ${total} match(es) for "${keyword}":\n`);
+    
+    for (const pkgName of packages) {
+      try {
+        const info = await fetchNpmPackage(pkgName);
+        
+        if (!info) {
+          console.log(`📦 ${pkgName} (信息获取失败)`);
+          console.log();
+          continue;
+        }
+        
+        const latestVersion = info['dist-tags']?.latest || 'unknown';
+        const pkg = info.versions?.[latestVersion];
+        const skillMeta = pkg?.skillmarket;
+        
+        console.log(`📦 ${info.name}@${latestVersion}`);
+        console.log(`   名称: ${skillMeta?.displayName || info.name}`);
+        console.log(`   描述: ${pkg?.description || 'N/A'}`);
+        console.log(`   平台: ${(skillMeta?.platforms || []).join(', ') || 'N/A'}`);
+        console.log();
+      } catch (e) {
+        console.log(`📦 ${pkgName} (获取失败: ${e})`);
+        console.log();
+      }
+    }
+  } catch (error) {
+    console.log(`Error searching skills: ${error}`);
+  }
+}
+
 export async function listSkills(options: LsOptions): Promise<void> {
-  const { installed, updates } = options;
+  const { installed, updates, page = 1, limit = 20, search } = options;
   
   // -------------------------------------------------------------------------
   // 模式1: 显示已安装的 skills
   // -------------------------------------------------------------------------
   if (installed) {
-    const skills = await getInstalledSkills();
+    let skills = await getInstalledSkills();
+    
+    // 搜索关键字过滤（仅本地）
+    if (search) {
+      skills = filterInstalledSkills(skills, search);
+    }
+    
+    const total = skills.length;
+    const totalPages = Math.ceil(total / limit) || 1;
+    const currentPage = Math.min(Math.max(1, page), totalPages);
     
     // 无已安装 skills 时给出提示
     if (skills.length === 0) {
-      console.log('No skills installed yet. Run "skm --ls" to see available skills.');
+      if (search) {
+        console.log(`No skills found matching "${search}".`);
+      } else {
+        console.log('No skills installed yet. Run "skm ls" to see available skills.');
+      }
       return;
     }
     
-    // 打印表头
-    console.log('Installed Skills:\n');
+    // 搜索结果提示
+    if (search) {
+      console.log(`Found ${total} match(es) for "${search}":\n`);
+    } else {
+      console.log(`Installed Skills (${total}):\n`);
+    }
+    
+    // 计算分页范围
+    const start = (currentPage - 1) * limit;
+    const end = Math.min(start + limit, total);
+    const pageSkills = skills.slice(start, end);
     
     // 遍历并打印每个 skill 的详细信息
-    for (const skill of skills) {
+    for (const skill of pageSkills) {
       // skill 名称和版本
       console.log(`  ${skill.id}@${skill.version}`);
       
@@ -92,6 +202,9 @@ export async function listSkills(options: LsOptions): Promise<void> {
       console.log();
     }
     
+    // 打印分页信息
+    console.log(`Page ${currentPage}/${totalPages} (${limit} per page) | Use --page N to navigate`);
+    
     return;
   }
   
@@ -100,41 +213,93 @@ export async function listSkills(options: LsOptions): Promise<void> {
   // -------------------------------------------------------------------------
   
   // 提示用户正在搜索
-  console.log('Searching npm registry...\n');
+  if (search) {
+    console.log(`Searching npm for "${search}"...\n`);
+  } else {
+    console.log('Searching npm registry...\n');
+  }
   
   try {
+    // 计算分页偏移量
+    const offset = (page - 1) * limit;
+    
     // 调用 npm search API 搜索 skillmarket 相关包
-    const packages = await searchSkillmarketPackages();
+    const { packages, total } = await searchSkillmarketPackages({
+      from: offset,
+      size: limit,
+      keyword: search
+    });
+    
+    const totalPages = Math.ceil(total / limit) || 1;
+    const currentPage = Math.min(Math.max(1, page), totalPages);
     
     // 无搜索结果时
     if (packages.length === 0) {
-      console.log('No skills found. Check back later!');
+      if (search) {
+        console.log(`No skills found matching "${search}".`);
+      } else {
+        console.log('No skills found. Check back later!');
+      }
       return;
     }
     
     // 打印找到的包数量
-    console.log(`Found ${packages.length} skill(s):\n`);
+    if (search) {
+      console.log(`Found ${total} match(es) for "${search}":\n`);
+    } else {
+      console.log(`Found ${total} skill(s):\n`);
+    }
     
     // 遍历每个包，获取详细信息并显示
     for (const pkgName of packages) {
-      const info = await fetchNpmPackage(pkgName);
-      
-      if (info && info['dist-tags']?.latest) {
-        const latestVersion = info['dist-tags'].latest;
+      try {
+        const info = await fetchNpmPackage(pkgName);
+        
+        if (!info) {
+          // 如果获取失败，仍然显示包名
+          console.log(`📦 ${pkgName} (信息获取失败)`);
+          console.log();
+          continue;
+        }
+        
+        // 获取最新版本号
+        const latestVersion = info['dist-tags']?.latest || 'unknown';
         
         // 获取该版本的详细信息
         const pkg = info.versions?.[latestVersion];
         
+        // 获取 skillmarket 元数据
+        const skillMeta = pkg?.skillmarket;
+        
         // 打印包名和版本
-        console.log(`  ${info.name}@${latestVersion}`);
+        console.log(`📦 ${info.name}@${latestVersion}`);
+        
+        // 打印显示名称
+        const displayName = skillMeta?.displayName || info.name;
+        console.log(`   名称: ${displayName}`);
+        
+        // 打印描述
+        console.log(`   描述: ${pkg?.description || 'N/A'}`);
         
-        // 打印描述（如果有的话）
-        console.log(`    ${pkg?.description || 'No description'}`);
+        // 打印支持平台
+        const platforms = skillMeta?.platforms || [];
+        console.log(`   平台: ${platforms.length > 0 ? platforms.join(', ') : 'N/A'}`);
+        
+        // 打印 npm 链接
+        const npmLink = pkg?.links?.npm || `https://www.npmjs.com/package/${info.name}`;
+        console.log(`   链接: ${npmLink}`);
         
         // 空行分隔
         console.log();
+      } catch (e) {
+        // 错误时仍显示包名
+        console.log(`📦 ${pkgName} (获取失败: ${e})`);
+        console.log();
       }
     }
+    
+    // 打印分页信息
+    console.log(`Page ${currentPage}/${totalPages} (${limit} per page) | Use --page N to navigate`);
   } catch (error) {
     // 网络错误处理
     console.log(`Error fetching skills: ${error}`);