@42ailab/42plugin 0.1.24 → 0.1.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@42ailab/42plugin",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "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

@@ -581,7 +581,43 @@ export async function downloadAndExtract(
     }
 
     // 解压
-    await tar.extract({ file: tempFile, cwd: targetDir, strip: 0 });
+    if (isWindows) {
+      // Windows: 使用 tar.Parser 手动提取，解决 Bun 编译的 tar 包无法正确写入文件的问题
+      const fileBuffer = await fs.readFile(tempFile);
+      const { Parser } = await import('tar');
+      const parser = new Parser();
+      const extractPromises: Promise<void>[] = [];
+
+      parser.on('entry', (entry) => {
+        const entryPath = path.join(targetDir, entry.path);
+        if (entry.type === 'Directory') {
+          extractPromises.push(fs.mkdir(entryPath, { recursive: true }));
+        } else if (entry.type === 'File') {
+          const chunks: Buffer[] = [];
+          entry.on('data', (chunk: Buffer) => chunks.push(chunk));
+          entry.on('end', () => {
+            extractPromises.push(
+              (async () => {
+                await fs.mkdir(path.dirname(entryPath), { recursive: true });
+                await fs.writeFile(entryPath, Buffer.concat(chunks));
+              })()
+            );
+          });
+        }
+        entry.resume();
+      });
+
+      await new Promise<void>((resolve, reject) => {
+        parser.on('end', resolve);
+        parser.on('error', reject);
+        parser.write(fileBuffer);
+        parser.end();
+      });
+
+      await Promise.all(extractPromises);
+    } else {
+      await tar.extract({ file: tempFile, cwd: targetDir, strip: 0 });
+    }
 
     // 清理
     await fs.unlink(tempFile).catch(() => {});
@@ -796,7 +832,6 @@ export async function createLink(
     }
 
     // 回退方案 2: 直接复制文件/目录
-    // 这是最后的保底方案，虽然会占用更多磁盘空间
     console.warn(
       `[Windows] 符号链接创建失败，回退到文件复制模式\n` +
       `  提示: 启用 Windows 开发者模式可使用符号链接，节省磁盘空间`

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/ 目录下）
  */