@42ailab/42plugin 0.1.11 → 0.1.13

package/package.json

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

package/src/api.ts

@@ -288,20 +288,37 @@ class ApiClient {
       }),
     });
 
-    const data = await response.json();
+    // 处理 JSON 解析失败
+    let data: Record<string, unknown>;
+    try {
+      data = await response.json();
+    } catch {
+      return { error: 'invalid_response', errorDescription: 'Invalid response from server' };
+    }
+
+    // 处理空响应
+    if (!data) {
+      return { error: 'empty_response', errorDescription: 'Empty response from server' };
+    }
+
+    // 如果有错误，直接返回错误信息
+    if (data.error) {
+      return {
+        error: data.error as string,
+        errorDescription: data.error_description as string,
+      };
+    }
 
     return {
-      accessToken: data.access_token,
+      accessToken: data.access_token as string,
       user: data.user
         ? {
-            id: data.user.id,
-            name: data.user.name,
-            username: data.user.username,
-            email: data.user.email,
+            id: (data.user as Record<string, unknown>).id as string,
+            name: (data.user as Record<string, unknown>).name as string,
+            username: (data.user as Record<string, unknown>).username as string,
+            email: (data.user as Record<string, unknown>).email as string,
           }
         : undefined,
-      error: data.error,
-      errorDescription: data.error_description,
     };
   }
 

package/src/cli.ts

@@ -15,16 +15,32 @@ import {
   checkCommand,
 } from './commands';
 
-// 版本号在构建时通过 --define 注入
-declare const __VERSION__: string;
-const version: string = typeof __VERSION__ !== 'undefined' ? __VERSION__ : '0.0.0-dev';
+// 版本号处理：
+// - Homebrew（编译后）：构建时通过 --define __VERSION__ 注入
+// - npm/dev（源码）：fallback 到 package.json
+declare const __VERSION__: string | undefined;
+
+function getVersion(): string {
+  // 1. 优先使用构建时注入的版本（Homebrew 二进制）
+  if (typeof __VERSION__ !== 'undefined') {
+    return __VERSION__;
+  }
+  // 2. 源码运行时从 package.json 读取（npm/dev）
+  try {
+    return require('../package.json').version;
+  } catch {
+    return '0.0.0-dev';
+  }
+}
+
+const VERSION = getVersion();
 
 const program = new Command();
 
 program
   .name('42plugin')
   .description('活水插件 - AI 插件管理工具')
-  .version(version, '-v, --version', '显示版本号')
+  .version(VERSION, '-v, --version', '显示版本号')
   .option('--verbose', '详细输出')
   .option('--no-color', '禁用颜色输出');
 
@@ -44,7 +60,7 @@ program
   .command('version')
   .description('显示版本信息')
   .action(() => {
-    console.log(`42plugin v${version}`);
+    console.log(`42plugin v${VERSION}`);
   });
 
 export { program };

package/src/utils.ts

@@ -11,31 +11,58 @@ import { TargetType, type ParsedTarget, type PluginType } from './types';
 /**
  * 解析安装目标
  *
- * - Plugin: author/name
- * - Kit: author/kit/slug
+ * 格式：
+ * - Plugin (2段): author/name (e.g., alice/smart-reviewer)
+ * - Plugin (3段): author/kit-name/plugin-name (e.g., anthropics/claude-code/create-plugin)
+ * - Kit: author/kit/slug (中间必须是 "kit" 关键字)
  */
 export function parseTarget(target: string): ParsedTarget {
-  // Kit: author/kit/slug
-  if (target.includes('/kit/')) {
-    const [author, , slug] = target.split('/');
+  const parts = target.split('/');
+
+  // Kit format: author/kit/slug (3段，中间是 "kit" 关键字)
+  if (parts.length === 3 && parts[1] === 'kit') {
+    const [author, , slug] = parts;
     if (!author || !slug) {
       throw new Error(`无效的套包格式: ${target}\n正确格式: author/kit/slug`);
     }
-    return { type: TargetType.Kit, fullName: target, author, name: slug };
+    return {
+      type: TargetType.Kit,
+      fullName: target,
+      author,
+      name: slug,
+    };
   }
 
-  // Plugin: author/name
-  const parts = target.split('/');
-  if (parts.length !== 2 || !parts[0] || !parts[1]) {
-    throw new Error(`无效的插件格式: ${target}\n正确格式: author/name`);
+  // Plugin format (2段): author/name
+  if (parts.length === 2) {
+    const [author, name] = parts;
+    if (!author || !name) {
+      throw new Error(`无效的安装目标格式: ${target}\n正确格式: author/name`);
+    }
+    return {
+      type: TargetType.Plugin,
+      fullName: target,
+      author,
+      name,
+    };
+  }
+
+  // Plugin format (3段): author/kit-name/plugin-name
+  if (parts.length === 3) {
+    const [author, kitName, pluginName] = parts;
+    if (!author || !kitName || !pluginName) {
+      throw new Error(`无效的安装目标格式: ${target}\n正确格式: author/kit-name/plugin-name`);
+    }
+    // 将 3 段格式传给 API，API 会处理
+    return {
+      type: TargetType.Plugin,
+      fullName: target,
+      author,
+      name: `${kitName}/${pluginName}`,  // 组合成 API 期望的路径格式
+    };
   }
 
-  return {
-    type: TargetType.Plugin,
-    fullName: target,
-    author: parts[0],
-    name: parts[1],
-  };
+  throw new Error(`无效的安装目标格式: ${target}\n正确格式: author/name 或 author/kit-name/plugin-name 或 author/kit/slug`);
 }
 
 // ============================================================================