@42ailab/42plugin 0.1.21 → 0.1.23

package/src/validators/plugin-validator.ts

@@ -42,8 +42,15 @@ const VALID_TYPES: PluginType[] = ['skill', 'agent', 'command', 'hook', 'mcp'];
 export class PluginValidator {
   /**
    * 完整验证（返回详细结果）
+   * @param pluginPath 插件路径
+   * @param overrideName 覆盖名称
+   * @param overrideType 覆盖类型（用户通过 -t 参数指定）
    */
-  async validateFull(pluginPath: string, overrideName?: string): Promise<ValidationResult> {
+  async validateFull(
+    pluginPath: string,
+    overrideName?: string,
+    overrideType?: PluginType
+  ): Promise<ValidationResult> {
     const result: ValidationResult = {
       valid: true,
       metadata: {
@@ -72,9 +79,9 @@ export class PluginValidator {
     // Phase 2: 提取元信息并进行类型检测
     try {
       if (stat.isFile()) {
-        result.metadata = await this.extractFileMetadata(absPath, overrideName);
+        result.metadata = await this.extractFileMetadata(absPath, overrideName, overrideType);
       } else if (stat.isDirectory()) {
-        result.metadata = await this.extractDirectoryMetadata(absPath, overrideName);
+        result.metadata = await this.extractDirectoryMetadata(absPath, overrideName, overrideType);
       } else {
         result.errors.push({
           code: 'E000',
@@ -130,7 +137,8 @@ export class PluginValidator {
    */
   private async extractFileMetadata(
     filePath: string,
-    overrideName?: string
+    overrideName?: string,
+    overrideType?: PluginType
   ): Promise<PluginMetadata> {
     const ext = path.extname(filePath).toLowerCase();
     const basename = path.basename(filePath, ext);
@@ -146,8 +154,9 @@ export class PluginValidator {
     const parsed = matter(content);
     const data = parsed.data as Record<string, unknown>;
 
-    // 推断类型
-    const type = this.inferTypeFromContent(content, data);
+    // 类型由用户通过 -t 参数或交互选择指定，必须提供
+    // 仅在未指定时使用 frontmatter 作为后备（向后兼容 validate 方法）
+    let type: PluginType = overrideType || (data.type as PluginType) || 'skill';
 
     return {
       name: overrideName || (data.name as string) || basename,
@@ -164,35 +173,23 @@ export class PluginValidator {
    */
   private async extractDirectoryMetadata(
     dirPath: string,
-    overrideName?: string
+    overrideName?: string,
+    overrideType?: PluginType
   ): Promise<PluginMetadata> {
     const entries = await fs.readdir(dirPath, { withFileTypes: true });
     const files = entries.filter((e) => e.isFile()).map((e) => e.name);
-    const lowerFiles = files.map((f) => f.toLowerCase());
     const basename = path.basename(dirPath);
 
-    // 检测插件类型（基于特征文件）
-    let type: PluginType = 'skill';
-    let frontmatterData: Record<string, unknown> = {};
-
-    // MCP: 有 mcp.json 或 .mcp.json
-    if (lowerFiles.some((f) => f === 'mcp.json' || f === '.mcp.json')) {
-      type = 'mcp';
-    }
-    // Hook: 有 hooks.json 或 hook.json
-    else if (lowerFiles.some((f) => f === 'hooks.json' || f === 'hook.json')) {
-      type = 'hook';
-    }
-    // Skill: 有 SKILL.md 或 skill.md
-    else if (lowerFiles.some((f) => f === 'skill.md')) {
-      type = 'skill';
-    }
+    // 类型由用户通过 -t 参数或交互选择指定，必须提供
+    // 仅在未指定时使用 'skill' 作为后备（向后兼容 validate 方法）
+    const type: PluginType = overrideType || 'skill';
 
     // 尝试读取主文件获取元信息
     const mainFiles = ['SKILL.md', 'skill.md', 'README.md', 'readme.md'];
     let description: string | undefined;
     let title: string | undefined;
     let tags: string[] | undefined;
+    let frontmatterData: Record<string, unknown> = {};
 
     for (const file of mainFiles) {
       if (files.includes(file)) {
@@ -204,9 +201,6 @@ export class PluginValidator {
           if (frontmatterData.title) title = frontmatterData.title as string;
           if (frontmatterData.description) description = frontmatterData.description as string;
           if (frontmatterData.tags) tags = frontmatterData.tags as string[];
-          if (frontmatterData.type && VALID_TYPES.includes(frontmatterData.type as PluginType)) {
-            type = frontmatterData.type as PluginType;
-          }
 
           // 如果没有 frontmatter 描述，取第一段文字
           if (!description && parsed.content) {
@@ -233,30 +227,6 @@ export class PluginValidator {
     };
   }
 
-  /**
-   * 从内容推断插件类型
-   */
-  private inferTypeFromContent(content: string, data: Record<string, unknown>): PluginType {
-    // 优先使用 frontmatter 中的 type
-    if (data.type && VALID_TYPES.includes(data.type as PluginType)) {
-      return data.type as PluginType;
-    }
-
-    // 从内容推断
-    const lowerContent = content.toLowerCase();
-
-    if (lowerContent.includes('you are') || lowerContent.includes('你是')) {
-      return 'agent';
-    }
-
-    if (lowerContent.includes('mcp') || lowerContent.includes('model context protocol')) {
-      return 'mcp';
-    }
-
-    // 默认为 skill
-    return 'skill';
-  }
-
   // ==========================================================================
   // Schema 验证
   // ==========================================================================