@volcengine/ark-cli 0.1.17-beta.ed7c4f9 → 0.1.17-beta.ff33f49

package/manifest.json

@@ -1,37 +1,37 @@
 {
-  "version": "0.1.17-beta.ed7c4f9",
+  "version": "0.1.17-beta.ff33f49",
   "platforms": {
     "darwin-amd64": {
-      "url": "https://lf3-static.bytednsdoc.com/obj/eden-cn/psjryh/ljhwZthlaukjlkulzlp/dev/0.1.17-beta.ed7c4f9/arkcli-0.1.17-beta.ed7c4f9-darwin-amd64",
-      "sha256": "1cd458529cc9d4c4d4d3f8ad6a3154a9ab0bd62a0ece6b2e2b80b0fcf5be4c44"
+      "url": "https://lf3-static.bytednsdoc.com/obj/eden-cn/psjryh/ljhwZthlaukjlkulzlp/dev/0.1.17-beta.ff33f49/arkcli-0.1.17-beta.ff33f49-darwin-amd64",
+      "sha256": "30b720390e282b55dae2a79865f88ea4458bda2bf642765d1e3ae73e8d9131c0"
     },
     "darwin-arm64": {
-      "url": "https://lf3-static.bytednsdoc.com/obj/eden-cn/psjryh/ljhwZthlaukjlkulzlp/dev/0.1.17-beta.ed7c4f9/arkcli-0.1.17-beta.ed7c4f9-darwin-arm64",
-      "sha256": "44584615e12373e4c46d7ed9d441cffb643616d0b4382576db8d08d6c0ee4a50"
+      "url": "https://lf3-static.bytednsdoc.com/obj/eden-cn/psjryh/ljhwZthlaukjlkulzlp/dev/0.1.17-beta.ff33f49/arkcli-0.1.17-beta.ff33f49-darwin-arm64",
+      "sha256": "174c750203b81620e1c6f94f0c909eb5e2de0f4315b3442cedcb3d0380ca406b"
     },
     "linux-amd64": {
-      "url": "https://lf3-static.bytednsdoc.com/obj/eden-cn/psjryh/ljhwZthlaukjlkulzlp/dev/0.1.17-beta.ed7c4f9/arkcli-0.1.17-beta.ed7c4f9-linux-amd64",
-      "sha256": "147de70a74c44eda90bbcf1d32af9cb818d5688f064f0bd3be73d0d3f3dd3ddc"
+      "url": "https://lf3-static.bytednsdoc.com/obj/eden-cn/psjryh/ljhwZthlaukjlkulzlp/dev/0.1.17-beta.ff33f49/arkcli-0.1.17-beta.ff33f49-linux-amd64",
+      "sha256": "367343620a80f245eee54c13debf56dd9950c652db570aa4041bc2ae1704d351"
     },
     "linux-arm64": {
-      "url": "https://lf3-static.bytednsdoc.com/obj/eden-cn/psjryh/ljhwZthlaukjlkulzlp/dev/0.1.17-beta.ed7c4f9/arkcli-0.1.17-beta.ed7c4f9-linux-arm64",
-      "sha256": "963ad7f439e859ab5d638a9b94a50a4b44b01c9ffece8add5018fa46fd528973"
+      "url": "https://lf3-static.bytednsdoc.com/obj/eden-cn/psjryh/ljhwZthlaukjlkulzlp/dev/0.1.17-beta.ff33f49/arkcli-0.1.17-beta.ff33f49-linux-arm64",
+      "sha256": "54f4de3039c2f1a0018c77d9ac720e029afc4fd86394b1e457dce043b907f46b"
     },
     "windows-amd64": {
-      "url": "https://lf3-static.bytednsdoc.com/obj/eden-cn/psjryh/ljhwZthlaukjlkulzlp/dev/0.1.17-beta.ed7c4f9/arkcli-0.1.17-beta.ed7c4f9-windows-amd64.exe",
-      "sha256": "480e90da35ead80b8e1c924f0f47d29b0fc4efdc31b7a0ca81b22615a13883d8"
+      "url": "https://lf3-static.bytednsdoc.com/obj/eden-cn/psjryh/ljhwZthlaukjlkulzlp/dev/0.1.17-beta.ff33f49/arkcli-0.1.17-beta.ff33f49-windows-amd64.exe",
+      "sha256": "8fb5ee829685566031acdbaeb72f195dc2a0a7b38efb339e6098df8712098cf6"
     },
     "windows-arm64": {
-      "url": "https://lf3-static.bytednsdoc.com/obj/eden-cn/psjryh/ljhwZthlaukjlkulzlp/dev/0.1.17-beta.ed7c4f9/arkcli-0.1.17-beta.ed7c4f9-windows-arm64.exe",
-      "sha256": "f4588330b7475f66522269676658b8c412bfec5fd5c825e795ddf17b479572fe"
+      "url": "https://lf3-static.bytednsdoc.com/obj/eden-cn/psjryh/ljhwZthlaukjlkulzlp/dev/0.1.17-beta.ff33f49/arkcli-0.1.17-beta.ff33f49-windows-arm64.exe",
+      "sha256": "1b623830d7ee01c362414b4056b1ef63a68889abd427aec06f4dcb06e02fee4d"
     }
   },
   "skills": {
     "primary": {
-      "url": "https://lf3-static.bytednsdoc.com/obj/eden-cn/psjryh/ljhwZthlaukjlkulzlp/dev/0.1.17-beta.ed7c4f9/skills.tar.gz",
-      "sha256": "a5bd12e0db96dfc836648fa8dd99022bc605c68c50f35f281efe9b897e01a780",
+      "url": "https://lf3-static.bytednsdoc.com/obj/eden-cn/psjryh/ljhwZthlaukjlkulzlp/dev/0.1.17-beta.ff33f49/skills.tar.gz",
+      "sha256": "26422ce55dac421a0ce4cd4d9905d5038f5aca8705802c1328935bfc5bebcbf7",
       "kind": "cdn"
     },
-    "tag": "v0.1.17-beta.ed7c4f9"
+    "tag": "v0.1.17-beta.ff33f49"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volcengine/ark-cli",
-  "version": "0.1.17-beta.ed7c4f9",
+  "version": "0.1.17-beta.ff33f49",
   "description": "火山方舟 ARK 平台命令行工具",
   "bin": {
     "arkcli": "scripts/run.js"

package/scripts/postinstall.js

@@ -1,7 +1,10 @@
 #!/usr/bin/env node
 // @volcengine/ark-cli postinstall。
 // 由 npm 的 postinstall lifecycle 触发:读 manifest.json,按当前平台从 CDN 下载
-// 对应二进制,校验 sha256,落到 <pkg>/bin/,然后(可选)+connect 装内置 skill。
+// 对应二进制,校验 sha256,落到 <pkg>/bin/,然后(非 CI 时)调 `arkcli +connect
+// --refresh` —— 由二进制【收口的 Go 实现】下载最新 skill 到 <pkg>/skills/ 再装进
+// 各 agent。skill 的下载/解压/校验逻辑不再在本脚本维护(避免 node / Go 两份),
+// 与用户手动 `arkcli +connect --refresh` 重装/刷新【共用同一份实现】。
 //
 // 与内场 postinstall 的区别(对外洁净契约):
 //   - 无 TEA 埋点
@@ -10,7 +13,7 @@
 //
 // 失败策略:
 //   - 下载/校验二进制 = 核心,失败则 exit 1(没有二进制这个包不可用,fail loud)
-//   - +connect 装 skill   = 增强,失败仅告警,不影响安装结果(exit 0)
+//   - +connect --refresh(下 skill + 装 agent) = 增强,失败仅告警,不影响安装结果(exit 0)
 
 const fs = require("fs");
 const path = require("path");
@@ -18,7 +21,6 @@ const http = require("http");
 const https = require("https");
 const crypto = require("crypto");
 const { execFileSync } = require("child_process");
-const os = require("os");
 
 // —— 逃生阀 ——
 if (process.env.ARKCLI_SKIP_POSTINSTALL === "1") {
@@ -99,134 +101,6 @@ function sha256(file) {
   return crypto.createHash("sha256").update(fs.readFileSync(file)).digest("hex");
 }
 
-// —— skill 安装(Phase 2:对外 skill 不内嵌,运行时下载到 <pkg>/skills/)——
-// 候选源顺序:ARKCLI_SKILLS_URL(逃生阀) > manifest.skills.primary(CDN,强 sha)
-//            > manifest.skills.fallback(GitHub archive,结构校验)。任一成功即停。
-// 全失败仅告警不阻断(skill 是 agent 增强,二进制才是核心;且 GitHub 国内不稳是已知风险)。
-
-// skills 目录有效性:含至少一个 <name>/SKILL.md。
-function isSkillsDir(p) {
-  try {
-    for (const e of fs.readdirSync(p, { withFileTypes: true })) {
-      if (e.isDirectory() && fs.existsSync(path.join(p, e.name, "SKILL.md"))) return true;
-    }
-  } catch (_) {}
-  return false;
-}
-
-// 在解压根下定位 skills/ 目录:CDN tar 顶层就是 skills/;
-// GitHub archive tarball 是 <repo>-<tag>/skills/(多一层前缀)。
-function findSkillsDir(root) {
-  const direct = path.join(root, "skills");
-  if (isSkillsDir(direct)) return direct;
-  let entries = [];
-  try { entries = fs.readdirSync(root, { withFileTypes: true }); } catch (_) {}
-  for (const e of entries) {
-    if (e.isDirectory()) {
-      const nested = path.join(root, e.name, "skills");
-      if (isSkillsDir(nested)) return nested;
-    }
-  }
-  return null;
-}
-
-// 解压前安全校验:不受信任归档(尤其 GitHub fallback 无 sha 强校验)可能塞越界/软链条目,
-// 直接 tar -x 会写出到目标目录之外(路径穿越 / 软链攻击)。这里先 tar -t 列条目,
-// 拒绝【绝对路径 / 含 .. 的路径 / 非「普通文件·目录」的条目(软链/硬链/设备等)】,通过才解压。
-function assertSafeTar(tarPath) {
-  const names = execFileSync("tar", ["-tzf", tarPath], { encoding: "utf-8" });
-  for (const raw of names.split("\n")) {
-    const name = raw.trim();
-    if (!name) continue;
-    if (name.startsWith("/") || name.split("/").includes("..")) {
-      throw new Error(`unsafe path in skills archive: ${name}`);
-    }
-  }
-  // tar -tvzf 行首是文件类型:- 普通文件 / d 目录 / l 软链 / h 硬链 / b,c,p,s 设备等。
-  const verbose = execFileSync("tar", ["-tvzf", tarPath], { encoding: "utf-8" });
-  for (const raw of verbose.split("\n")) {
-    const line = raw.trim();
-    if (!line) continue;
-    const type = line[0];
-    if (type !== "-" && type !== "d") {
-      throw new Error(`unsafe entry type '${type}' in skills archive: ${line}`);
-    }
-  }
-}
-
-function extractSkillsTo(tarPath, destSkillsDir) {
-  assertSafeTar(tarPath); // 不受信任归档:解压前校验路径与类型,防越界写 / 软链攻击
-  const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "arkcli-skills-"));
-  try {
-    execFileSync("tar", ["-xzf", tarPath, "-C", tmp], { stdio: "ignore" });
-    const src = findSkillsDir(tmp);
-    if (!src) throw new Error("archive 内找不到有效 skills/(无 */SKILL.md)");
-    fs.rmSync(destSkillsDir, { recursive: true, force: true });
-    try {
-      fs.renameSync(src, destSkillsDir);
-    } catch (_) {
-      fs.cpSync(src, destSkillsDir, { recursive: true }); // 跨设备 rename 失败兜底
-    }
-  } finally {
-    fs.rmSync(tmp, { recursive: true, force: true });
-  }
-}
-
-async function installSkillsFromSource(src, destSkillsDir) {
-  const tmpTar = path.join(os.tmpdir(), `arkcli-skills-${process.pid}.tar.gz`);
-  try {
-    await download(src.url, tmpTar);
-    if (src.sha256) {
-      const actual = sha256(tmpTar);
-      if (actual !== src.sha256) {
-        throw new Error(`sha256 mismatch (expected ${src.sha256}, got ${actual})`);
-      }
-    }
-    extractSkillsTo(tmpTar, destSkillsDir);
-    if (!isSkillsDir(destSkillsDir)) {
-      throw new Error("解压后 skills/ 无 */SKILL.md(结构校验失败)");
-    }
-  } finally {
-    fs.rmSync(tmpTar, { force: true });
-  }
-}
-
-async function installSkills() {
-  const pkgDir = path.join(__dirname, "..");
-  const destSkillsDir = path.join(pkgDir, "skills");
-  const skills = manifest.skills;
-  const override = (process.env.ARKCLI_SKILLS_URL || "").trim();
-
-  // 候选源:override(逃生阀,无 sha) > primary(强 sha) > fallback(结构校验)。
-  const sources = [];
-  if (override) sources.push({ url: override, sha256: null, kind: "override" });
-  if (skills && skills.primary && skills.primary.url) {
-    sources.push({ url: skills.primary.url, sha256: skills.primary.sha256 || null, kind: skills.primary.kind || "primary" });
-  }
-  if (skills && skills.fallback && skills.fallback.url) {
-    sources.push({ url: skills.fallback.url, sha256: null, kind: skills.fallback.kind || "fallback" });
-  }
-  if (sources.length === 0) {
-    console.warn("@volcengine/ark-cli: manifest 无 skills 源,跳过 skill 下载(可稍后 arkcli +connect 手动补)");
-    return false;
-  }
-
-  for (const src of sources) {
-    try {
-      console.log(`@volcengine/ark-cli: downloading skills from ${src.kind}...`);
-      await installSkillsFromSource(src, destSkillsDir);
-      console.log(`@volcengine/ark-cli: skills ready (${src.kind})`);
-      return true;
-    } catch (e) {
-      console.warn(`@volcengine/ark-cli: skill source ${src.kind} failed: ${e.message || e}`);
-    }
-  }
-  console.warn(
-    "@volcengine/ark-cli: 所有 skill 源下载失败;稍后可跑 `arkcli +connect`,或设 ARKCLI_SKILLS_URL 指定镜像后重装",
-  );
-  return false;
-}
-
 (async () => {
   fs.mkdirSync(binDir, { recursive: true });
   const tmp = `${binPath}.download`;
@@ -265,33 +139,36 @@ async function installSkills() {
     process.exit(0);
   }
 
-  // —— Phase 2:下载 skill 到 <pkg>/skills/(对外不内嵌);失败仅告警不阻断 ——
-  try {
-    await installSkills();
-  } catch (err) {
-    console.warn(`@volcengine/ark-cli: skill install skipped (${err.message || err})`);
-  }
-
-  // —— +connect 把 skill 装到各 agent:增强项,失败不影响安装结果 ——
-  // 无 controlling tty 时静默跳过(管道 / Windows 无 /dev/tty 等)。
+  // —— +connect --refresh:下载最新 skill 到 <pkg>/skills/ 再装进各 agent ——
+  // skill 的下载/解压/校验【收口在 Go 二进制】(internal/skillfs.Refresh),postinstall
+  // 不再自己下 skill。+connect 非交互(自动检测 agent + 全装),有/无 tty 都能跑:有
+  // tty 时把日志接到 /dev/tty(体验更好),无 tty 时走默认 stdio(connect 不读 stdin、
+  // 不会卡)。整体是【增强项】:下载或安装失败仅告警,不影响包安装结果(exit 0)。
   let ttyFd = null;
   try {
     ttyFd = fs.openSync("/dev/tty", "r+");
   } catch (_) {
-    // no controlling tty (CI、管道、Windows 无 /dev/tty 等)
-  }
-  if (ttyFd === null) {
-    process.exit(0);
+    // 无 controlling tty(管道 / Windows 无 /dev/tty 等)— 仍执行,只是输出走默认 stdio
   }
+  const stdio = ttyFd !== null ? ["ignore", ttyFd, ttyFd] : "inherit";
   try {
-    execFileSync(binPath, ["+connect"], { stdio: ["ignore", ttyFd, ttyFd] });
+    execFileSync(binPath, ["+connect", "--refresh"], { stdio });
   } catch (err) {
+    const msg =
+      `arkcli: skill 下载/安装跳过 (${err.message || err});` +
+      "稍后可手动跑 `arkcli +connect --refresh` 重新下载并安装";
+    if (ttyFd !== null) {
+      try {
+        fs.writeSync(ttyFd, msg + "\n");
+      } catch (_) {}
+    } else {
+      console.warn(msg);
+    }
+  }
+  if (ttyFd !== null) {
     try {
-      fs.writeSync(ttyFd, `arkcli: skill sync skipped (${err.message || err})\n`);
+      fs.closeSync(ttyFd);
     } catch (_) {}
   }
-  try {
-    fs.closeSync(ttyFd);
-  } catch (_) {}
   process.exit(0);
 })();