@42ailab/42plugin 0.1.23 → 0.1.25

package/package.json

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

package/src/commands/install.ts

@@ -20,7 +20,7 @@ import {
   getSessionToken,
 } from '../db';
 import { config } from '../config';
-import { parseTarget, getInstallPath, formatBytes, getTypeIcon } from '../utils';
+import { parseTarget, getInstallPath, formatBytes, getTypeIcon, normalizeInstallPath } from '../utils';
 import { TargetType, type PluginDownloadInfo } from '../types';
 
 export const installCommand = new Command('install')
@@ -152,7 +152,8 @@ async function installPlugin(
 
     // 确定安装路径
     const projectPath = options.global ? config.globalDir : process.cwd();
-    const linkPath = path.join(projectPath, downloadInfo.installPath);
+    const normalizedPath = normalizeInstallPath(downloadInfo.installPath, !!options.global);
+    const linkPath = path.join(projectPath, normalizedPath);
 
     // 检查是否有同名冲突（不同插件安装到同一路径）
     const conflictPlugin = await checkInstallConflict(projectPath, linkPath, downloadInfo.fullName);
@@ -209,11 +210,11 @@ async function installPlugin(
 
     if (options.global) {
       console.log(chalk.green('✓ 已全局安装，对所有项目生效'));
-      console.log(chalk.gray(`  → ~/.claude/${downloadInfo.installPath}`));
+      console.log(chalk.gray(`  → ~/.claude/${normalizedPath}`));
       console.log(chalk.gray('  提示: 使用 42plugin list --global 查看全局插件'));
     } else {
       console.log(chalk.green(`✓ 已安装到当前项目: ${path.basename(projectPath)}`));
-      console.log(chalk.gray(`  → ${downloadInfo.installPath}`));
+      console.log(chalk.gray(`  → ${normalizedPath}`));
     }
   } catch (error) {
     spinner.fail('安装失败');
@@ -260,11 +261,13 @@ async function installKit(
     const project = await getOrCreateProject(projectPath);
 
     // 第一阶段：检查所有冲突（并行）
+    const isGlobal = !!options.global;
     const conflictCheckSpinner = ora('检查安装冲突...').start();
     const conflictResults = await Promise.all(
       plugins.map(async (item) => {
         const downloadInfo = item.download;
-        const linkPath = path.join(projectPath, downloadInfo.installPath);
+        const normalizedPath = normalizeInstallPath(downloadInfo.installPath, isGlobal);
+        const linkPath = path.join(projectPath, normalizedPath);
         const conflictPlugin = await checkInstallConflict(projectPath, linkPath, downloadInfo.fullName);
         return { item, linkPath, conflictPlugin };
       })

package/src/db.ts

@@ -583,11 +583,22 @@ export async function downloadAndExtract(
     // 解压
     await tar.extract({ file: tempFile, cwd: targetDir, strip: 0 });
 
+    if (config.debug) {
+      const entries = await fs.readdir(targetDir);
+      console.log(`[DEBUG] 解压完成，目录内容: ${entries.join(', ')}`);
+    }
+
     // 清理
     await fs.unlink(tempFile).catch(() => {});
 
     // 返回最终路径（如果只有一个子目录则进入）
-    return resolveFinalPath(targetDir, pluginType);
+    const finalPath = await resolveFinalPath(targetDir, pluginType);
+    if (config.debug) {
+      console.log(`[DEBUG] 最终缓存路径: ${finalPath}`);
+      const finalEntries = await fs.readdir(finalPath).catch(() => []);
+      console.log(`[DEBUG] 最终路径内容: ${finalEntries.join(', ') || '(空)'}`);
+    }
+    return finalPath;
   } catch (error) {
     await fs.rm(targetDir, { recursive: true, force: true }).catch(() => {});
     throw error;
@@ -754,6 +765,17 @@ export async function createLink(
   const targetDir = path.dirname(normalizedTarget);
   await fs.mkdir(targetDir, { recursive: true });
 
+  if (config.debug) {
+    console.log(`[DEBUG] createLink: ${sourcePath} -> ${normalizedTarget}`);
+  }
+
+  // 验证源路径存在
+  try {
+    await fs.access(sourcePath);
+  } catch {
+    throw new Error(`源路径不存在: ${sourcePath}`);
+  }
+
   // 移除已存在的链接
   try {
     const stat = await fs.lstat(normalizedTarget);
@@ -768,6 +790,11 @@ export async function createLink(
   const sourceStat = await fs.stat(sourcePath);
   const isDirectory = sourceStat.isDirectory();
 
+  if (config.debug && isDirectory) {
+    const entries = await fs.readdir(sourcePath);
+    console.log(`[DEBUG] 源目录内容 (${entries.length} 项): ${entries.join(', ')}`);
+  }
+
   // 尝试创建符号链接
   try {
     const linkType = isDirectory ? 'dir' : 'file';
@@ -788,9 +815,18 @@ export async function createLink(
     // 回退方案 1: 对于目录，尝试使用 Junction
     if (isDirectory) {
       try {
+        if (config.debug) {
+          console.log(`[DEBUG] 尝试创建 Junction: ${normalizedTarget} -> ${sourcePath}`);
+        }
         await createJunction(sourcePath, normalizedTarget);
+        if (config.debug) {
+          console.log(`[DEBUG] Junction 创建成功`);
+        }
         return;
-      } catch {
+      } catch (junctionError) {
+        if (config.debug) {
+          console.log(`[DEBUG] Junction 创建失败: ${(junctionError as Error).message}`);
+        }
         // Junction 也失败，继续尝试复制
       }
     }
@@ -801,7 +837,14 @@ export async function createLink(
       `[Windows] 符号链接创建失败，回退到文件复制模式\n` +
       `  提示: 启用 Windows 开发者模式可使用符号链接，节省磁盘空间`
     );
+    if (config.debug) {
+      console.log(`[DEBUG] 开始复制: ${sourcePath} -> ${normalizedTarget}`);
+    }
     await copyRecursive(sourcePath, normalizedTarget);
+    if (config.debug) {
+      const destEntries = await fs.readdir(normalizedTarget).catch(() => []);
+      console.log(`[DEBUG] 复制完成，目标目录内容: ${destEntries.join(', ') || '(空)'}`);
+    }
   }
 }
 

package/src/utils.ts

@@ -69,6 +69,28 @@ export function parseTarget(target: string): ParsedTarget {
 // 安装路径
 // ============================================================================
 
+/**
+ * 规范化安装路径（用于全局安装）
+ *
+ * API 返回的 installPath 包含 .claude/ 前缀（如 .claude/skills/xxx/）
+ * 全局安装目录本身就是 ~/.claude，所以需要去掉前缀避免路径重复
+ *
+ * @param installPath API 返回的安装路径
+ * @param isGlobal 是否全局安装
+ * @returns 规范化后的路径
+ */
+export function normalizeInstallPath(installPath: string, isGlobal: boolean): string {
+  if (!isGlobal) {
+    return installPath;
+  }
+  // 全局安装时去掉 .claude/ 前缀
+  const prefix = '.claude/';
+  if (installPath.startsWith(prefix)) {
+    return installPath.slice(prefix.length);
+  }
+  return installPath;
+}
+
 /**
  * 获取插件安装路径（.claude/ 目录下）
  */