@spzhongwin/skill-logger-plugin 1.0.12 → 1.0.13

package/dist/index.js

@@ -106,7 +106,6 @@ import fsSync from "node:fs";
 import path3 from "node:path";
 import os2 from "node:os";
 import { execFile } from "node:child_process";
-import { promisify } from "node:util";
 import { randomUUID, createHash } from "node:crypto";
 
 // src/skill-version.ts
@@ -139,14 +138,37 @@ function parseSkillVersion(content) {
 }
 
 // src/updater.ts
-var execFileAsync = promisify(execFile);
+var EXTRACT_TIMEOUT_MS = 3e4;
 var ATTEMPT_COOLDOWN_MS = 30 * 60 * 1e3;
 function skillIdentityHash(code, version) {
   return createHash("sha256").update(`${code} ${code} ${version}`).digest("hex");
 }
+function extractorCommandForPlatform(platform, zipPath, destDir) {
+  return platform === "darwin" ? { command: "ditto", args: ["-x", "-k", zipPath, destDir] } : { command: "unzip", args: ["-o", "-q", zipPath, "-d", destDir] };
+}
+function runExtractor(command, args) {
+  return new Promise((resolve, reject) => {
+    const child = execFile(command, args, {
+      encoding: "utf8",
+      timeout: EXTRACT_TIMEOUT_MS,
+      killSignal: "SIGKILL",
+      maxBuffer: 1024 * 1024
+    }, (error, _stdout, stderr) => {
+      if (!error) {
+        resolve();
+        return;
+      }
+      const detail = String(stderr || "").trim();
+      const timeout = error.killed ? `\uFF0C\u8D85\u8FC7 ${EXTRACT_TIMEOUT_MS}ms \u5DF2\u7EC8\u6B62` : "";
+      reject(new Error(`${command} \u89E3\u538B\u5931\u8D25${timeout}: ${detail || error.message}`));
+    });
+    child.stdin?.end();
+  });
+}
 async function systemUnzip(zipPath, destDir) {
   await fs3.mkdir(destDir, { recursive: true });
-  await execFileAsync("unzip", ["-o", "-q", zipPath, "-d", destDir]);
+  const { command, args } = extractorCommandForPlatform(process.platform, zipPath, destDir);
+  await runExtractor(command, args);
 }
 var SkillUpdater = class {
   getConfig;
@@ -464,7 +486,7 @@ var SkillUpdater = class {
       emit("download.file.written", { bytes: buf.byteLength });
       const staging = path3.join(work, "staging");
       const unzipStartedAt = Date.now();
-      emit("unzip.start");
+      emit("unzip.start", { extractor: process.platform === "darwin" ? "ditto" : "unzip" });
       await this.unzip(zipPath, staging);
       emit("unzip.completed", { elapsedMs: Date.now() - unzipStartedAt });
       const srcRoot = await this.locateSkillRoot(staging, 0);
@@ -1354,11 +1376,11 @@ import path6 from "node:path";
 // src/identity.ts
 import os3 from "node:os";
 import { execFile as execFile2 } from "node:child_process";
-import { promisify as promisify2 } from "node:util";
-var execFileAsync2 = promisify2(execFile2);
+import { promisify } from "node:util";
+var execFileAsync = promisify(execFile2);
 async function getGitConfigValue(key) {
   try {
-    const { stdout } = await execFileAsync2("git", ["config", "--global", key]);
+    const { stdout } = await execFileAsync("git", ["config", "--global", key]);
     return stdout.trim();
   } catch {
     console.warn(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spzhongwin/skill-logger-plugin",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "type": "module",
   "exports": "./dist/index.js",
   "scripts": {

package/src/updater.test.ts

@@ -4,7 +4,7 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import os from "node:os";
 import { createHash } from "node:crypto";
-import { SkillUpdater, type OutdatedCopy } from "./updater.ts";
+import { extractorCommandForPlatform, SkillUpdater, type OutdatedCopy } from "./updater.ts";
 import type { PluginConfig } from "./types.ts";
 
 /** 与 updater/服务端一致的身份哈希：code code version（空格分隔）。 */
@@ -72,6 +72,17 @@ const outdatedFor = (target: string): OutdatedCopy[] => [
 ];
 
 describe("SkillUpdater", () => {
+  it("macOS 使用 ditto 解压，其他平台保持 unzip", () => {
+    assert.deepEqual(extractorCommandForPlatform("darwin", "/tmp/a.zip", "/tmp/out"), {
+      command: "ditto",
+      args: ["-x", "-k", "/tmp/a.zip", "/tmp/out"],
+    });
+    assert.deepEqual(extractorCommandForPlatform("linux", "/tmp/a.zip", "/tmp/out"), {
+      command: "unzip",
+      args: ["-o", "-q", "/tmp/a.zip", "-d", "/tmp/out"],
+    });
+  });
+
   it("手动更新可复用同一次下载，同时覆盖用户与内置模板目录并记录关键阶段", async () => {
     const calls: string[] = [];
     const traces: Array<{ stage: string; data?: Record<string, unknown> }> = [];

package/src/updater.ts

@@ -5,7 +5,7 @@
  * 流程（每个 skill@version 仅下载一次，覆盖其全部 workspace 副本）：
  *   1. POST {platformBaseUrl}/skill_package/pull {skillName, version} → { url }
  *   2. GET url → zip 字节 → 写入临时文件
- *   3. 解压到临时 staging 目录（默认调用系统 unzip）
+ *   3. 解压到临时 staging 目录（macOS 使用 ditto，其他系统使用 unzip）
  *   4. 在 staging 内定位含 SKILL.md 的目录作为源根（兼容包内带或不带顶层目录）
  *   5. 逐个目标目录「直接覆盖、不备份」：先复制到同级临时目录，再删旧、原子 rename 换入，
  *      避免中途失败留下损坏的半成品；不保留 .bak。
@@ -20,12 +20,11 @@ import fsSync from "node:fs";
 import path from "node:path";
 import os from "node:os";
 import { execFile } from "node:child_process";
-import { promisify } from "node:util";
 import { randomUUID, createHash } from "node:crypto";
 import type { PluginConfig } from "./types.ts";
 import { parseSkillVersion, readSkillVersion } from "./skill-version.ts";
 
-const execFileAsync = promisify(execFile);
+const EXTRACT_TIMEOUT_MS = 30_000;
 
 /**
  * 同一 skill@version 的更新尝试冷却期。
@@ -77,10 +76,42 @@ export type UpdaterOptions = {
   cooldownStatePath?: string;
 };
 
-/** 默认解压：系统 unzip -o -q（覆盖、静默）。 */
+export function extractorCommandForPlatform(
+  platform: NodeJS.Platform,
+  zipPath: string,
+  destDir: string,
+): { command: string; args: string[] } {
+  return platform === "darwin"
+    ? { command: "ditto", args: ["-x", "-k", zipPath, destDir] }
+    : { command: "unzip", args: ["-o", "-q", zipPath, "-d", destDir] };
+}
+
+function runExtractor(command: string, args: string[]): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const child = execFile(command, args, {
+      encoding: "utf8",
+      timeout: EXTRACT_TIMEOUT_MS,
+      killSignal: "SIGKILL",
+      maxBuffer: 1024 * 1024,
+    }, (error, _stdout, stderr) => {
+      if (!error) {
+        resolve();
+        return;
+      }
+      const detail = String(stderr || "").trim();
+      const timeout = error.killed ? `，超过 ${EXTRACT_TIMEOUT_MS}ms 已终止` : "";
+      reject(new Error(`${command} 解压失败${timeout}: ${detail || error.message}`));
+    });
+    // 防止 unzip 遇到异常包时弹出 Continue? 并永久等待输入。
+    child.stdin?.end();
+  });
+}
+
+/** 默认解压：macOS 的 ditto 正确支持 ZIP 中文文件名；其余平台保持原 unzip 行为。 */
 async function systemUnzip(zipPath: string, destDir: string): Promise<void> {
   await fs.mkdir(destDir, { recursive: true });
-  await execFileAsync("unzip", ["-o", "-q", zipPath, "-d", destDir]);
+  const { command, args } = extractorCommandForPlatform(process.platform, zipPath, destDir);
+  await runExtractor(command, args);
 }
 
 export class SkillUpdater {
@@ -448,7 +479,7 @@ export class SkillUpdater {
       // 2. 调用系统解压工具 unzip
       const staging = path.join(work, "staging");
       const unzipStartedAt = Date.now();
-      emit("unzip.start");
+      emit("unzip.start", { extractor: process.platform === "darwin" ? "ditto" : "unzip" });
       await this.unzip(zipPath, staging);
       emit("unzip.completed", { elapsedMs: Date.now() - unzipStartedAt });