@42ailab/42plugin 0.1.26 → 0.1.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@42ailab/42plugin",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "description": "活水插件",
   "type": "module",
   "main": "src/index.ts",

package/src/api.ts

@@ -527,7 +527,7 @@ class ApiClient {
         version?: string;
         content_hash?: string;
         visibility?: 'self' | 'public';
-      }>(`/v1/plugins/me/${name}/status`);
+      }>(`/v1/plugins/status/${name}`);
 
       return {
         exists: result.exists,

package/src/auth-middleware.ts

@@ -29,7 +29,6 @@ const SKIP_AUTH_COMMANDS = new Set([
   'auth',
   'list',
   'check',
-  'completion',
   'setup',
   'version',
 ]);

package/src/commands/list.ts

@@ -14,7 +14,7 @@ export const listCommand = new Command('list')
   .description('查看已安装的插件')
   .option('-g, --global', '显示全局安装的插件 (~/.claude/)')
   .option('-a, --all', '显示所有项目的插件（包括全局）')
-  .option('-t, --type <type>', '筛选类型 (skill, agent, command, hook, mcp)')
+  .option('-t, --type <type>', '筛选类型 (skill, agent, command, hook)')
   .option('--json', '输出 JSON 格式')
   .action(async (options) => {
     try {

package/src/commands/publish.ts

@@ -13,14 +13,13 @@ import { ValidationError, UploadError, AuthRequiredError } from '../errors';
 import { getTypeIcon } from '../utils';
 import type { PluginType } from '../types';
 
-const VALID_TYPES: PluginType[] = ['skill', 'agent', 'command', 'hook', 'mcp'];
+const VALID_TYPES: PluginType[] = ['skill', 'agent', 'command', 'hook'];
 
 const TYPE_DESCRIPTIONS: Record<PluginType, string> = {
   skill: 'skill(技能) - 包含 SKILL.md 的目录，为 Claude 提供特定能力',
   agent: 'agent(代理) - 单个 .md 文件，定义 AI 角色和行为',
   command: 'command(命令) - 单个 .md 文件，定义可执行的斜杠命令',
   hook: 'hook(钩子) - 包含 hooks.json 的目录，响应事件触发',
-  mcp: 'mcp(MCP 服务) - 包含 mcp.json 的目录，Model Context Protocol 服务',
 };
 
 /**
@@ -43,9 +42,6 @@ async function suggestType(pluginPath: string): Promise<PluginType> {
   if (normalizedPath.includes('/.claude/hooks/') || normalizedPath.includes('.claude/hooks/')) {
     return 'hook';
   }
-  if (normalizedPath.includes('/.claude/mcp/') || normalizedPath.includes('.claude/mcp/')) {
-    return 'mcp';
-  }
 
   // 2. 检查是否是目录，如果是则检查特征文件
   try {
@@ -54,9 +50,6 @@ async function suggestType(pluginPath: string): Promise<PluginType> {
       const files = await fs.readdir(absPath);
       const lowerFiles = files.map((f) => f.toLowerCase());
 
-      if (lowerFiles.includes('mcp.json') || lowerFiles.includes('.mcp.json')) {
-        return 'mcp';
-      }
       if (lowerFiles.includes('hooks.json') || lowerFiles.includes('hook.json')) {
         return 'hook';
       }
@@ -80,7 +73,7 @@ export const publishCommand = new Command('publish')
   .option('-f, --force', '强制发布（即使内容未变化）')
   .option('--public', '公开发布（默认仅自己可见）')
   .option('-n, --name <name>', '覆盖插件名称')
-  .option('-t, --type <type>', '指定插件类型 (skill|agent|command|hook|mcp)')
+  .option('-t, --type <type>', '指定插件类型 (skill|agent|command|hook)')
   .action(async (pluginPath, options) => {
     try {
       // 验证 --type 参数

package/src/commands/search.ts

@@ -54,7 +54,7 @@ function displayKitResults(items: KitSearchResult[]): void {
 export const searchCommand = new Command('search')
   .description('搜索插件和套包')
   .argument('<keyword>', '搜索关键词')
-  .option('-t, --type <type>', '筛选插件类型 (skill, agent, command, hook, mcp)')
+  .option('-t, --type <type>', '筛选插件类型 (skill, agent, command, hook)')
   .option('-k, --kit', '只搜索套包')
   .option('-p, --plugin', '只搜索插件')
   .option('-l, --limit <n>', '每页数量', String(DEFAULT_PAGE_SIZE))

package/src/commands/setup.ts

@@ -39,7 +39,8 @@ async function setupCompletion(): Promise<void> {
 
   if (!shell) {
     console.log(chalk.yellow('无法检测当前 Shell 类型'));
-    console.log(chalk.gray('请手动运行: 42plugin completion <bash|zsh|fish>'));
+    console.log(chalk.gray('支持的 Shell: bash, zsh, fish'));
+    console.log(chalk.gray('请确保 $SHELL 环境变量正确设置'));
     return;
   }
 
@@ -110,7 +111,7 @@ function getShellConfigFile(shell: string): string | null {
 async function checkAlreadyConfigured(configFile: string): Promise<boolean> {
   try {
     const content = await fs.readFile(configFile, 'utf-8');
-    return content.includes('42plugin completion');
+    return content.includes('# 42plugin CLI 补全');
   } catch {
     return false;
   }
@@ -136,22 +137,227 @@ async function installCompletion(shell: string, configFile: string): Promise<voi
 }
 
 function getCompletionInitScript(shell: string): string {
+  // 42plugin 支持的命令和选项
+  const commands = ['auth', 'search', 'install', 'list', 'uninstall', 'publish', 'check', 'setup', 'version'];
+  const globalOptions = ['--help', '--version', '--verbose', '--no-color'];
+
   switch (shell) {
     case 'bash':
       return `
 # 42plugin CLI 补全
-eval "$(42plugin completion bash)"
+_42plugin_installed_plugins() {
+  42plugin list --all --json 2>/dev/null | grep -o '"fullName": "[^"]*"' | cut -d'"' -f4
+}
+
+_42plugin_completions() {
+  local cur prev pprev commands
+  cur="\${COMP_WORDS[COMP_CWORD]}"
+  prev="\${COMP_WORDS[COMP_CWORD-1]}"
+  pprev="\${COMP_WORDS[COMP_CWORD-2]:-}"
+  commands="${commands.join(' ')}"
+
+  # 处理 --type 后的类型补全
+  if [[ "\${prev}" == "--type" ]] || [[ "\${prev}" == "-t" ]]; then
+    COMPREPLY=( $(compgen -W "skill agent command hook" -- "\${cur}") )
+    return 0
+  fi
+
+  case "\${prev}" in
+    42plugin)
+      COMPREPLY=( $(compgen -W "\${commands} ${globalOptions.join(' ')}" -- "\${cur}") )
+      return 0
+      ;;
+    uninstall|rm)
+      # 从本地数据库获取已安装插件
+      local plugins=$(_42plugin_installed_plugins)
+      COMPREPLY=( $(compgen -W "\${plugins}" -- "\${cur}") )
+      return 0
+      ;;
+    install)
+      return 0
+      ;;
+    search)
+      return 0
+      ;;
+    publish|pub)
+      # 路径补全 + 选项补全
+      if [[ "\${cur}" == -* ]]; then
+        COMPREPLY=( $(compgen -W "--dry-run --force --public --name --type -f -n -t" -- "\${cur}") )
+      else
+        COMPREPLY=( $(compgen -f -d -- "\${cur}") )
+      fi
+      return 0
+      ;;
+    check)
+      # 路径补全
+      COMPREPLY=( $(compgen -f -d -- "\${cur}") )
+      return 0
+      ;;
+    *)
+      # 检查是否在 publish/check 子命令中
+      for word in "\${COMP_WORDS[@]}"; do
+        if [[ "\$word" == "publish" ]] || [[ "\$word" == "pub" ]] || [[ "\$word" == "check" ]]; then
+          if [[ "\${cur}" == -* ]]; then
+            COMPREPLY=( $(compgen -W "--dry-run --force --public --name --type -f -n -t --help" -- "\${cur}") )
+          else
+            COMPREPLY=( $(compgen -f -d -- "\${cur}") )
+          fi
+          return 0
+        fi
+        if [[ "\$word" == "uninstall" ]] || [[ "\$word" == "rm" ]]; then
+          local plugins=$(_42plugin_installed_plugins)
+          COMPREPLY=( $(compgen -W "\${plugins}" -- "\${cur}") )
+          return 0
+        fi
+      done
+      COMPREPLY=( $(compgen -W "--help" -- "\${cur}") )
+      return 0
+      ;;
+  esac
+}
+complete -F _42plugin_completions 42plugin
 `;
+
     case 'zsh':
       return `
 # 42plugin CLI 补全
-eval "$(42plugin completion zsh)"
+_42plugin_installed_plugins() {
+  local -a plugins
+  plugins=(\${(f)"$(42plugin list --all --json 2>/dev/null | grep -o '"fullName": "[^"]*"' | cut -d'"' -f4)"})
+  _describe 'installed plugin' plugins
+}
+
+_42plugin() {
+  local -a commands
+  commands=(
+    'auth:登录或查看认证状态'
+    'search:搜索插件'
+    'install:安装插件'
+    'list:列出已安装插件'
+    'uninstall:卸载插件'
+    'publish:发布插件'
+    'check:检查插件更新'
+    'setup:配置 CLI 环境'
+    'version:显示版本信息'
+  )
+
+  _arguments -C \\
+    "1: :{_describe 'command' commands}" \\
+    "*::arg:->args"
+
+  case "\$state" in
+    args)
+      case \$words[1] in
+        publish|pub)
+          _arguments \\
+            '--dry-run[仅验证不发布]' \\
+            '-f[强制发布]' '--force[强制发布]' \\
+            '--public[公开发布]' \\
+            '-n[指定名称]:name:' '--name[指定名称]:name:' \\
+            '-t[指定类型]:type:(skill agent command hook)' '--type[指定类型]:type:(skill agent command hook)' \\
+            '*:path:_files -/'
+          ;;
+        check)
+          _arguments \\
+            '--fix[自动修复问题]' \\
+            '*:path:_files -/'
+          ;;
+        install)
+          _arguments \\
+            '-g[全局安装]' '--global[全局安装]' \\
+            '*:plugin:'
+          ;;
+        uninstall|rm)
+          _arguments \\
+            '-g[卸载全局插件]' '--global[卸载全局插件]' \\
+            '*:plugin:_42plugin_installed_plugins'
+          ;;
+        list|ls)
+          _arguments \\
+            '-g[显示全局插件]' '--global[显示全局插件]' \\
+            '-a[显示所有项目]' '--all[显示所有项目]' \\
+            '-t[筛选类型]:type:(skill agent command hook)' '--type[筛选类型]:type:(skill agent command hook)' \\
+            '--json[输出 JSON]'
+          ;;
+        search)
+          _arguments \\
+            '-t[筛选类型]:type:(skill agent command hook kit)' '--type[筛选类型]:type:(skill agent command hook kit)' \\
+            '*:query:'
+          ;;
+        auth)
+          _arguments \\
+            '--logout[登出]' \\
+            '--status[查看状态]'
+          ;;
+        *)
+          _arguments '*: :_files'
+          ;;
+      esac
+      ;;
+  esac
+}
+compdef _42plugin 42plugin
 `;
+
     case 'fish':
       return `
 # 42plugin CLI 补全
-42plugin completion fish | source
+
+# 获取已安装插件列表
+function __42plugin_installed_plugins
+  42plugin list --all --json 2>/dev/null | string match -r '"fullName": "[^"]*"' | string replace -r '"fullName": "([^"]*)"' '$1'
+end
+
+# 主命令
+complete -c 42plugin -n "__fish_use_subcommand" -a "auth" -d "登录或查看认证状态"
+complete -c 42plugin -n "__fish_use_subcommand" -a "search" -d "搜索插件"
+complete -c 42plugin -n "__fish_use_subcommand" -a "install" -d "安装插件"
+complete -c 42plugin -n "__fish_use_subcommand" -a "list" -d "列出已安装插件"
+complete -c 42plugin -n "__fish_use_subcommand" -a "uninstall" -d "卸载插件"
+complete -c 42plugin -n "__fish_use_subcommand" -a "publish" -d "发布插件"
+complete -c 42plugin -n "__fish_use_subcommand" -a "check" -d "检查插件更新"
+complete -c 42plugin -n "__fish_use_subcommand" -a "setup" -d "配置 CLI 环境"
+complete -c 42plugin -n "__fish_use_subcommand" -a "version" -d "显示版本信息"
+
+# auth 选项
+complete -c 42plugin -n "__fish_seen_subcommand_from auth" -l logout -d "登出"
+complete -c 42plugin -n "__fish_seen_subcommand_from auth" -l status -d "查看状态"
+
+# publish 选项 + 路径补全
+complete -c 42plugin -n "__fish_seen_subcommand_from publish pub" -l dry-run -d "仅验证不发布"
+complete -c 42plugin -n "__fish_seen_subcommand_from publish pub" -s f -l force -d "强制发布"
+complete -c 42plugin -n "__fish_seen_subcommand_from publish pub" -l public -d "公开发布"
+complete -c 42plugin -n "__fish_seen_subcommand_from publish pub" -s n -l name -d "指定名称" -r
+complete -c 42plugin -n "__fish_seen_subcommand_from publish pub" -s t -l type -d "指定类型" -ra "skill agent command hook"
+complete -c 42plugin -n "__fish_seen_subcommand_from publish pub" -a "(__fish_complete_path)" -d "路径"
+
+# check 选项 + 路径补全
+complete -c 42plugin -n "__fish_seen_subcommand_from check" -l fix -d "自动修复"
+complete -c 42plugin -n "__fish_seen_subcommand_from check" -a "(__fish_complete_path)" -d "路径"
+
+# install 选项
+complete -c 42plugin -n "__fish_seen_subcommand_from install" -s g -l global -d "全局安装"
+
+# uninstall 选项 + 已安装插件补全
+complete -c 42plugin -n "__fish_seen_subcommand_from uninstall rm" -s g -l global -d "卸载全局插件"
+complete -c 42plugin -n "__fish_seen_subcommand_from uninstall rm" -a "(__42plugin_installed_plugins)" -d "已安装插件"
+
+# list 选项
+complete -c 42plugin -n "__fish_seen_subcommand_from list ls" -s g -l global -d "显示全局插件"
+complete -c 42plugin -n "__fish_seen_subcommand_from list ls" -s a -l all -d "显示所有项目"
+complete -c 42plugin -n "__fish_seen_subcommand_from list ls" -s t -l type -d "筛选类型" -ra "skill agent command hook"
+complete -c 42plugin -n "__fish_seen_subcommand_from list ls" -l json -d "输出 JSON"
+
+# search 选项
+complete -c 42plugin -n "__fish_seen_subcommand_from search" -s t -l type -d "筛选类型" -ra "skill agent command hook kit"
+
+# 全局选项
+complete -c 42plugin -l help -d "显示帮助"
+complete -c 42plugin -s v -l version -d "显示版本"
+complete -c 42plugin -l verbose -d "详细输出"
+complete -c 42plugin -l no-color -d "禁用颜色"
 `;
+
     default:
       return '';
   }

package/src/services/manifest.ts

@@ -1,14 +1,14 @@
 /**
  * 插件清单解析服务
  *
- * 从插件目录读取 SKILL.md / AGENT.md / COMMAND.md / HOOK.md / MCP.md
+ * 从插件目录读取 SKILL.md / AGENT.md / COMMAND.md / HOOK.md
  * 解析 frontmatter 获取插件元数据
  */
 import * as fs from 'fs/promises';
 import * as path from 'path';
 import matter from 'gray-matter';
 
-export type CapabilityType = 'skill' | 'agent' | 'command' | 'hook' | 'mcp';
+export type CapabilityType = 'skill' | 'agent' | 'command' | 'hook';
 
 export interface PluginManifest {
   name: string;           // 必填，插件名称
@@ -28,13 +28,12 @@ const TYPE_FILES: Record<string, CapabilityType> = {
   'AGENT.md': 'agent',
   'COMMAND.md': 'command',
   'HOOK.md': 'hook',
-  'MCP.md': 'mcp',
 };
 
 /**
  * 从目录读取插件清单
  *
- * 扫描顺序：SKILL.md → AGENT.md → COMMAND.md → HOOK.md → MCP.md
+ * 扫描顺序：SKILL.md → AGENT.md → COMMAND.md → HOOK.md
  * 返回第一个找到的清单
  */
 export async function readManifest(pluginPath: string): Promise<PluginManifest> {
@@ -97,8 +96,7 @@ export async function readManifest(pluginPath: string): Promise<PluginManifest>
     `  - SKILL.md (技能插件)\n` +
     `  - AGENT.md (代理插件)\n` +
     `  - COMMAND.md (命令插件)\n` +
-    `  - HOOK.md (钩子插件)\n` +
-    `  - MCP.md (MCP 插件)`
+    `  - HOOK.md (钩子插件)`
   );
 }
 

package/src/services/packager.ts

@@ -16,7 +16,6 @@ import type { PackageResult } from '../types';
 
 // 需要保留的功能性隐藏文件
 const ALLOWED_HIDDEN_FILES = [
-  '.mcp.json',
   '.tool.json',
   '.plugin.json',
   '.claude',

package/src/services/publisher.ts

@@ -268,7 +268,6 @@ export class Publisher {
       agent: ['AGENT.md', 'agent.md'],
       command: ['COMMAND.md', 'command.md'],
       hook: ['HOOK.md', 'hook.md'],
-      mcp: ['MCP.md', 'mcp.md'],
     };
 
     const fallbackNames = ['README.md', 'readme.md'];

package/src/types.ts

@@ -8,7 +8,7 @@
 // 基础类型
 // ============================================================================
 
-export type PluginType = 'skill' | 'agent' | 'command' | 'hook' | 'mcp';
+export type PluginType = 'skill' | 'agent' | 'command' | 'hook';
 export type PriceTier = 'free' | 'vip' | 'premium';
 
 // ============================================================================
@@ -393,18 +393,3 @@ export interface HookConfig {
   };
 }
 
-// MCP 配置
-export interface McpConfig {
-  name?: string;
-  protocol_version?: string;
-  capabilities?: {
-    resources?: boolean;
-    tools?: boolean;
-    sampling?: boolean;
-  };
-  tools?: Array<{
-    name: string;
-    description?: string;
-    inputSchema?: Record<string, unknown>;
-  }>;
-}

package/src/utils.ts

@@ -104,8 +104,6 @@ export function getInstallPath(type: PluginType, name: string): string {
       return `.claude/commands/${name}.md`;
     case 'hook':
       return `.claude/hooks/${name}`;
-    case 'mcp':
-      return `.claude/mcp/${name}/`;
     default:
       return `.claude/${type}/${name}/`;
   }
@@ -157,7 +155,6 @@ const TYPE_LABELS: Record<PluginType, string> = {
   agent: 'Agent',
   command: 'Command',
   hook: 'Hook',
-  mcp: 'MCP',
 };
 
 const TYPE_ICONS: Record<PluginType, string> = {
@@ -165,7 +162,6 @@ const TYPE_ICONS: Record<PluginType, string> = {
   agent: '🤖',
   command: '⌘',
   hook: '🪝',
-  mcp: '🔌',
 };
 
 export function getTypeLabel(type: PluginType): string {

package/src/validators/plugin-validator.ts

@@ -6,7 +6,6 @@
  * - agent: Agent 插件（仅单文件）
  * - command: 命令插件（目录或单文件）
  * - hook: Hook 插件（仅目录，需要 hooks.json）
- * - mcp: MCP 服务器插件（仅目录，需要 mcp.json）
  */
 
 import fs from 'fs/promises';
@@ -19,7 +18,6 @@ import type {
   ValidationResult,
   ValidationIssue,
   HookConfig,
-  McpConfig,
 } from '../types';
 
 // ============================================================================
@@ -33,7 +31,7 @@ const MIN_DESCRIPTION_LENGTH = 20;
 const MAX_TAG_LENGTH = 32;
 const MAX_AGENT_FILE_SIZE = 50 * 1024; // 50KB
 
-const VALID_TYPES: PluginType[] = ['skill', 'agent', 'command', 'hook', 'mcp'];
+const VALID_TYPES: PluginType[] = ['skill', 'agent', 'command', 'hook'];
 
 // ============================================================================
 // PluginValidator 类
@@ -349,9 +347,6 @@ export class PluginValidator {
       case 'hook':
         await this.validateHook(absPath, isDirectory, result);
         break;
-      case 'mcp':
-        await this.validateMcp(absPath, isDirectory, result);
-        break;
       case 'skill':
       case 'command':
         // skill 和 command 支持单文件和目录，无特殊限制
@@ -471,76 +466,6 @@ export class PluginValidator {
     }
   }
 
-  /**
-   * MCP 类型验证
-   */
-  private async validateMcp(
-    absPath: string,
-    isDirectory: boolean,
-    result: ValidationResult
-  ): Promise<void> {
-    // MCP 必须是目录
-    if (!isDirectory) {
-      result.errors.push({
-        code: 'E050',
-        field: 'type',
-        message: 'MCP 类型必须是目录格式',
-        suggestion: '请创建包含 mcp.json 的目录',
-      });
-      return;
-    }
-
-    // 检查 mcp.json 是否存在
-    const mcpJsonPath = path.join(absPath, 'mcp.json');
-    const dotMcpJsonPath = path.join(absPath, '.mcp.json');
-
-    let configPath: string | null = null;
-    if (await this.exists(mcpJsonPath)) {
-      configPath = mcpJsonPath;
-    } else if (await this.exists(dotMcpJsonPath)) {
-      configPath = dotMcpJsonPath;
-    }
-
-    if (!configPath) {
-      result.errors.push({
-        code: 'E051',
-        message: '缺少 mcp.json 配置文件',
-        suggestion: '创建 mcp.json 文件定义 MCP 服务器配置',
-      });
-      return;
-    }
-
-    // 验证 mcp.json 内容
-    try {
-      const content = await fs.readFile(configPath, 'utf-8');
-      const config = JSON.parse(content) as McpConfig;
-
-      // 建议指定 protocol_version
-      if (!config.protocol_version) {
-        result.warnings.push({
-          code: 'W050',
-          message: '建议指定 protocol_version',
-          suggestion: '添加 "protocol_version": "2024-11" 到 mcp.json',
-        });
-      }
-
-      // 建议声明 capabilities
-      if (!config.capabilities) {
-        result.warnings.push({
-          code: 'W051',
-          message: '建议声明 capabilities',
-          suggestion: '添加 capabilities 对象声明支持的功能',
-        });
-      }
-    } catch (e) {
-      result.errors.push({
-        code: 'E051',
-        message: `mcp.json 解析失败: ${(e as Error).message}`,
-        suggestion: '请检查 JSON 格式是否正确',
-      });
-    }
-  }
-
   // ==========================================================================
   // 引用检查
   // ==========================================================================